Query: Fix (*exemplarsStream).receive/(*metricMetadataStream).receive…

…/(*targetsStreamStream).receive infinite loop when target response Unimplemented error (#4676) (#4681) Signed-off-by: hanjm <hanjinming@outlook.com>
thanos-io · Sep 19, 2021 · 2d4d140 · 2d4d140
1 parent ef03a32
commit 2d4d140
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/pkg/exemplars/proxy.go b/pkg/exemplars/proxy.go
@@ -191,8 +191,8 @@ func (stream *exemplarsStream) receive(ctx context.Context) error {
 			if err := stream.server.Send(exemplarspb.NewWarningExemplarsResponse(err)); err != nil {
 				return errors.Wrapf(err, "sending exemplars error to server %v", stream.server)
 			}
-
-			continue
+			// Not an error if response strategy is warning.
+			return nil
 		}
 
 		if w := exemplar.GetWarning(); w != "" {

diff --git a/pkg/metadata/proxy.go b/pkg/metadata/proxy.go
@@ -135,7 +135,8 @@ func (stream *metricMetadataStream) receive(ctx context.Context) error {
 				return errors.Wrapf(err, "sending metadata error to server %v", stream.server)
 			}
 
-			continue
+			// Not an error if response strategy is warning.
+			return nil
 		}
 
 		if w := resp.GetWarning(); w != "" {

diff --git a/pkg/targets/proxy.go b/pkg/targets/proxy.go
@@ -119,8 +119,8 @@ func (stream *targetsStream) receive(ctx context.Context) error {
 			if err := stream.server.Send(targetspb.NewWarningTargetsResponse(err)); err != nil {
 				return errors.Wrapf(err, "sending targets error to server %v", stream.server)
 			}
-
-			continue
+			// Not an error if response strategy is warning.
+			return nil
 		}
 
 		if w := target.GetWarning(); w != "" {