Merge pull request #635 from grafana/krajo/merge-upstream

krajorama · web-flow · commit e5b85c151ba8 · 2024-05-15T15:52:45.000+02:00
merge upstream at 179163a
diff --git a/tsdb/index/postings.go b/tsdb/index/postings.go
@@ -419,6 +419,7 @@ func (p *MemPostings) PostingsForLabelMatching(ctx context.Context, name string,
 	count := 1
 	for _, v := range vals {
 		if count%checkContextEveryNIterations == 0 && ctx.Err() != nil {
+			p.mtx.RUnlock()
 			return ErrPostings(ctx.Err())
 		}
 		count++

Original file line number	Diff line number	Diff line change
`@@ -419,6 +419,7 @@ func (p *MemPostings) PostingsForLabelMatching(ctx context.Context, name string,`
`419`	`419`	`count := 1`
`420`	`420`	`for _, v := range vals {`
`421`	`421`	`if count%checkContextEveryNIterations == 0 && ctx.Err() != nil {`
	`422`	`+ p.mtx.RUnlock()`
`422`	`423`	`return ErrPostings(ctx.Err())`
`423`	`424`	`}`
`424`	`425`	`count++`