Skip to content

Commit 9012300

Browse files
committed
Reapply "mimirpb: Clone metadata fields rather than maintaining references (#13573)"
This reverts commit 69ca33a.
1 parent efc7fec commit 9012300

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,7 @@
519519
* [BUGFIX] Block-builder-scheduler: Fix bugs in handling of partitions with no commit. #12130
520520
* [BUGFIX] Ingester: Fix issue where ingesters can exit read-only mode during idle compactions, resulting in write errors. #12128
521521
* [BUGFIX] otlp: Reverts #11889 which has a pooled memory re-use bug. #12266
522+
* [BUGFIX] Ingester: Fix issue where metadata stored in ingesters indirectly prevents large Kafka record buffers from being garbage collected, resulting in unusual memory growth. #13573
522523

523524
### Mixin
524525

pkg/mimirpb/mimir.pb.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/mimirpb/mimir.pb.go.expdiff

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/pkg/mimirpb/mimir.pb.go b/pkg/mimirpb/mimir.pb.go
2-
index e7d3c6a439..dda8609298 100644
2+
index 3a886f5049..dda8609298 100644
33
--- a/pkg/mimirpb/mimir.pb.go
44
+++ b/pkg/mimirpb/mimir.pb.go
55
@@ -14,7 +14,6 @@ import (
@@ -526,9 +526,9 @@ index e7d3c6a439..dda8609298 100644
526526
- }
527527
- if len(unit) > 0 || len(help) > 0 || metricType != 0 {
528528
- metadata.add(normalizedMetricName, MetricMetadata{
529-
- MetricFamilyName: normalizedMetricName,
530-
- Help: help,
531-
- Unit: unit,
529+
- MetricFamilyName: strings.Clone(normalizedMetricName),
530+
- Help: strings.Clone(help),
531+
- Unit: strings.Clone(unit),
532532
- Type: MetricMetadata_MetricType(metricType),
533533
- })
534534
- }

0 commit comments

Comments
 (0)