Let forward requests run until timeout (#2679)

Signed-off-by: Kemal Akkoyun <[email protected]>
thanos-io · May 29, 2020 · 92fa67d · 92fa67d
1 parent 6dcdf11
commit 92fa67d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/pkg/receive/handler.go b/pkg/receive/handler.go
@@ -517,11 +517,17 @@ func (h *Handler) replicate(ctx context.Context, tenant string, wreq *prompb.Wri
 	}
 	h.mtx.RUnlock()
 
+	var err error
 	ctx, cancel := context.WithTimeout(ctx, h.options.ForwardTimeout)
-	defer cancel()
+	defer func() {
+		// If there is no error, let forward requests optimistically run until timeout.
+		if err != nil {
+			cancel()
+		}
+	}()
 
 	quorum := h.writeQuorum()
-	err := h.fanoutForward(ctx, tenant, replicas, wreqs, quorum)
+	err = h.fanoutForward(ctx, tenant, replicas, wreqs, quorum)
 	if countCause(err, isNotReady) >= quorum {
 		return tsdb.ErrNotReady
 	}