Skip to content

Commit 8c664ed

Browse files
committed
Fix group-replica strategy
1 parent 120d328 commit 8c664ed

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

cmd/thanos/query.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ func runQuery(
575575
GroupReplicaPartialResponseStrategy: groupReplicaPartialResponseStrategy,
576576
EnableDedupMerge: enableDedupMerge,
577577
}
578-
level.Info(logger).Log("msg", "databricks querier features", "opts", opts)
578+
level.Info(logger).Log("msg", "databricks querier features", "opts", fmt.Sprintf("%+v", opts))
579579
queryableCreator = query.NewQueryableCreatorWithOptions(
580580
logger,
581581
extprom.WrapRegistererWithPrefix("thanos_query_", reg),

pkg/store/proxy.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,15 +389,15 @@ func (s *ProxyStore) Series(originalRequest *storepb.SeriesRequest, srv storepb.
389389
level.Error(reqLogger).Log(
390390
"msg", "Multipel replicas have failures for the same group",
391391
"group", st.GroupKey(),
392-
"replicas", failedStores[st.GroupKey()],
392+
"replicas", fmt.Sprintf("%+v", failedStores[st.GroupKey()]),
393393
)
394394
return err
395395
}
396396
if len(groupReplicaStores[st.GroupKey()]) == 1 && failedStores[st.GroupKey()][st.ReplicaKey()] > 1 {
397397
level.Error(reqLogger).Log(
398398
"msg", "A single replica group has multiple failures",
399399
"group", st.GroupKey(),
400-
"replicas", failedStores[st.GroupKey()],
400+
"replicas", fmt.Sprintf("%+v", failedStores[st.GroupKey()]),
401401
)
402402
return err
403403
}
@@ -422,6 +422,7 @@ func (s *ProxyStore) Series(originalRequest *storepb.SeriesRequest, srv storepb.
422422

423423
respSet, err := newAsyncRespSet(ctx, st, r, s.responseTimeout, s.retrievalStrategy, &s.buffers, r.ShardInfo, reqLogger, s.metrics.emptyStreamResponses)
424424
if err != nil {
425+
// NB: respSet is nil in case of error.
425426
level.Error(reqLogger).Log("err", err)
426427
level.Warn(s.logger).Log("msg", "Store failure", "group", st.GroupKey(), "replica", st.ReplicaKey())
427428
bumpCounter(st.GroupKey(), st.ReplicaKey(), failedStores)
@@ -430,6 +431,7 @@ func (s *ProxyStore) Series(originalRequest *storepb.SeriesRequest, srv storepb.
430431
if checkGroupReplicaErrors(st, err) != nil {
431432
return err
432433
}
434+
continue
433435
} else if !r.PartialResponseDisabled || r.PartialResponseStrategy == storepb.PartialResponseStrategy_WARN {
434436
if err := srv.Send(storepb.NewWarnSeriesResponse(err)); err != nil {
435437
return err

0 commit comments

Comments
 (0)