Skip to content

Commit

Permalink
Show warnings for lazySeriesSet (#10277)
Browse files Browse the repository at this point in the history
* Show warnings for lazySeriesSet

* Update changelog

* Update changelog again
  • Loading branch information
zenador authored Jan 2, 2025
1 parent 5dfc154 commit e610fcb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* [ENHANCEMENT] Ingester: More efficient CPU/memory utilization-based read request limiting. #10325
* [BUGFIX] Distributor: Use a boolean to track changes while merging the ReplicaDesc components, rather than comparing the objects directly. #10185
* [BUGFIX] Querier: fix timeout responding to query-frontend when response size is very close to `-querier.frontend-client.grpc-max-send-msg-size`. #10154
* [BUGFIX] Query-frontend and querier: show warning/info annotations in some cases where they were missing (if a lazy querier was used). #10277
* [BUGFIX] Ruler: fix indeterminate rules being always run concurrently (instead of never) when `-ruler.max-independent-rule-evaluation-concurrency` is set. https://github.com/prometheus/prometheus/pull/15560 #10258
* [BUGFIX] PromQL: Fix various UTF-8 bugs related to quoting. https://github.com/prometheus/prometheus/pull/15531 #10258
* [BUGFIX] Ruler: Fixed an issue when using the experimental `-ruler.max-independent-rule-evaluation-concurrency` feature, where if a rule group was eligible for concurrency, it would flap between running concurrently or not based on the time it took after running concurrently. #9726 #10189
Expand Down
5 changes: 4 additions & 1 deletion pkg/storage/lazyquery/lazyquery.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,5 +116,8 @@ func (s *lazySeriesSet) Err() error {

// Warnings implements storage.SeriesSet.
func (s *lazySeriesSet) Warnings() annotations.Annotations {
return nil
if s.next == nil {
s.next = <-s.future
}
return s.next.Warnings()
}

0 comments on commit e610fcb

Please sign in to comment.