merge the overcounting to release branch (#84)

Author: jnyi

pkg/receive/handler.go

@@ -715,6 +715,9 @@ func (h *Handler) gatherWriteStats(remoteWrites map[endpointReplica]map[string]t
 	var stats tenantRequestStats = make(tenantRequestStats)
 
 	for er := range remoteWrites {
+		if er.replica != 0 {
+			continue // Skip replicated writes, only count once.
+		}
 		for tenant, series := range remoteWrites[er] {
 			samples := 0
 

pkg/receive/handler_test.go

@@ -1899,7 +1899,7 @@ func TestIngestorRestart(t *testing.T) {
 	stats, err := client.handleRequest(ctx, 0, "test", data)
 	require.NoError(t, err)
 	require.Equal(t, tenantRequestStats{
-		"test": requestStats{timeseries: 2, totalSamples: 2},
+		"test": requestStats{timeseries: 1, totalSamples: 1},
 	}, stats)
 
 	// close srv2 to simulate ingestor down