expose 429 errors for other causes beyond timestamp conflicts (#35)

databricks · May 10, 2024 · 74c2326 · 74c2326
2 parents 65d236e + 3fd1778
commit 74c2326
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/pkg/receive/handler.go b/pkg/receive/handler.go
@@ -1240,11 +1240,6 @@ func (p *peerWorker) RemoteWriteAsync(ctx context.Context, req *storepb.WriteReq
 
 		tracing.DoInSpan(ctx, "receive_forward", func(ctx context.Context) {
 			_, err := storepb.NewWriteableStoreClient(p.cc).RemoteWrite(ctx, req)
-			if isConflict(err) && p.wp.Size() > 1 {
-				// conflict errors are valid in our dual scraping setup, worker pool size > 1 to bypass unit tests
-				// see original PR: https://github.com/databricks/thanos/pull/27
-				err = nil
-			}
 			responseWriter <- newWriteResponse(
 				seriesIDs,
 				errors.Wrapf(err, "forwarding request to endpoint %v", er.endpoint),

diff --git a/pkg/receive/writer.go b/pkg/receive/writer.go
@@ -156,8 +156,8 @@ func (r *Writer) Write(ctx context.Context, tenantID string, wreq *prompb.WriteR
 			case storage.ErrDuplicateSampleForTimestamp:
 				// we don't care about duplicated sample for the same timestamp
 				continue
-				// numSamplesDuplicates++
-				// level.Debug(tLogger).Log("msg", "Duplicate sample for timestamp", "lset", lset, "value", s.Value, "timestamp", s.Timestamp)
+				//numSamplesDuplicates++
+				//level.Debug(tLogger).Log("msg", "Duplicate sample for timestamp", "lset", lset, "value", s.Value, "timestamp", s.Timestamp)
 			case storage.ErrOutOfBounds:
 				numSamplesOutOfBounds++
 				level.Debug(tLogger).Log("msg", "Out of bounds metric", "lset", lset, "value", s.Value, "timestamp", s.Timestamp)