Skip to content

Commit 1f7c524

Browse files
authored
Merge pull request #8810 from prymitive/grpc-partial-response
ruler: correctly pass query partial response
2 parents cdca548 + 045a320 commit 1f7c524

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ It is recommend to upgrade the storage components first (Receive, Store, etc.) a
2323
- [#8720](https://github.com/thanos-io/thanos/issues/8720): Receive: Fix 503 errors during restarts in some cases.
2424
- [#8799](https://github.com/thanos-io/thanos/pull/8799): *: Set a `KeepaliveEnforcementPolicy` with `MinTime: 10s` on all gRPC servers, matching the client keepalive interval.
2525
- [#8806](https://github.com/thanos-io/thanos/pull/8806): Receive: Validate tenant IDs extracted from split-tenant labels to prevent path traversal.
26+
- [#8810](https://github.com/thanos-io/thanos/pull/8810): Ruler: correctly pass query partial response for gRPC.
2627

2728
### Added
2829

cmd/thanos/rule.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,9 @@ func queryFuncCreator(
10111011
if grpcEndpointSet != nil {
10121012
queryAPIClients := grpcEndpointSet.GetQueryAPIClients()
10131013
for _, i := range rand.Perm(len(queryAPIClients)) {
1014-
e := query.NewRemoteEngine(logger, queryAPIClients[i], query.Opts{})
1014+
e := query.NewRemoteEngine(logger, queryAPIClients[i], query.Opts{
1015+
PartialResponse: partialResponseStrategy == storepb.PartialResponseStrategy_WARN,
1016+
})
10151017
expr, err := extpromql.ParseExpr(qs)
10161018
if err != nil {
10171019
level.Error(logger).Log("err", err, "query", qs)

0 commit comments

Comments
 (0)