Remove fromAll from logs

Author: zenador

pkg/distributor/ha_tracker.go

@@ -474,7 +474,7 @@ func (h *defaultHaTracker) updateKVStoreAll(ctx context.Context, now time.Time)
 			}
 			// Release lock while we talk to KVStore, which could take a while.
 			h.electedLock.RUnlock()
-			err := uh.updateKVStore(ctx, cluster, replica, now, sampleTime, receivedAt, true)
+			err := uh.updateKVStore(ctx, cluster, replica, now, sampleTime, receivedAt)
 			h.electedLock.RLock()
 			if err != nil {
 				// Failed to store - log it but carry on
@@ -591,7 +591,7 @@ func (h *defaultHaTracker) checkReplica(ctx context.Context, userID, cluster, re
 	}
 
 	uh := h.forUser(userID)
-	err := uh.updateKVStore(ctx, cluster, replica, now, sampleTime, now.UnixMilli(), false)
+	err := uh.updateKVStore(ctx, cluster, replica, now, sampleTime, now.UnixMilli())
 	if err != nil {
 		level.Error(h.logger).Log("msg", "failed to update KVStore - rejecting sample", "err", err)
 		return err
@@ -663,7 +663,7 @@ func (h *defaultHaTracker) updateCache(userID, cluster string, desc *ReplicaDesc
 
 // If we do set the value then err will be nil and desc will contain the value we set.
 // If there is already a valid value in the store, return nil, nil.
-func (h *defaultHaTrackerForUser) updateKVStore(ctx context.Context, cluster, replica string, now, sampleTime time.Time, receivedAt int64, fromAll bool) error {
+func (h *defaultHaTrackerForUser) updateKVStore(ctx context.Context, cluster, replica string, now, sampleTime time.Time, receivedAt int64) error {
 	key := fmt.Sprintf("%s/%s", h.userID, cluster)
 	var desc *ReplicaDesc
 	var electedAtTime, electedChanges int64
@@ -692,11 +692,11 @@ func (h *defaultHaTrackerForUser) updateKVStore(ctx context.Context, cluster, re
 				}
 				if h.failoverSampleTimeout > 0 {
 					if sampleTime.Sub(timestamp.Time(desc.ReceivedAt)) < h.failoverSampleTimeout {
-						level.Info(h.logger).Log("msg", "replica differs, but it's too early to failover", "user", h.userID, "cluster", cluster, "replica", replica, "elected", desc.Replica, "received_at", timestamp.Time(desc.ReceivedAt), "sample_time", sampleTime, "failover_sample_timeout", h.failoverSampleTimeout, "from_all", fromAll)
+						level.Info(h.logger).Log("msg", "replica differs, but it's too early to failover", "user", h.userID, "cluster", cluster, "replica", replica, "elected", desc.Replica, "received_at", timestamp.Time(desc.ReceivedAt), "sample_time", sampleTime, "failover_sample_timeout", h.failoverSampleTimeout)
 						return nil, false, nil
 					}
 				}
-				level.Info(h.logger).Log("msg", "replica differs, attempting to update kv", "user", h.userID, "cluster", cluster, "replica", replica, "elected", desc.Replica, "received_at", timestamp.Time(desc.ReceivedAt), "sample_time", sampleTime, "failover_sample_timeout", h.failoverSampleTimeout, "from_all", fromAll)
+				level.Info(h.logger).Log("msg", "replica differs, attempting to update kv", "user", h.userID, "cluster", cluster, "replica", replica, "elected", desc.Replica, "received_at", timestamp.Time(desc.ReceivedAt), "sample_time", sampleTime, "failover_sample_timeout", h.failoverSampleTimeout)
 				electedAtTime = timestamp.FromTime(now)
 				electedChanges = desc.ElectedChanges + 1
 			}

pkg/distributor/ha_tracker_test.go

@@ -1532,7 +1532,7 @@ func TestHATracker_UserSpecificTimeouts(t *testing.T) {
 	now := time.Now()
 
 	// First request should succeed (establishes the replica as elected)
-	err = userTracker.updateKVStore(context.Background(), cluster, replica, now, now, now.UnixMilli(), false)
+	err = userTracker.updateKVStore(context.Background(), cluster, replica, now, now, now.UnixMilli())
 	assert.NoError(t, err)
 	tracker.electedLock.Lock()
 	assert.Equal(t, replica, tracker.clusters[userID][cluster].elected.Replica)
@@ -1542,7 +1542,7 @@ func TestHATracker_UserSpecificTimeouts(t *testing.T) {
 
 	// Second request within user-specific timeout should not update KV store
 	now = now.Add(2 * time.Second)
-	err = userTracker.updateKVStore(context.Background(), cluster, replica, now, now, now.UnixMilli(), false)
+	err = userTracker.updateKVStore(context.Background(), cluster, replica, now, now, now.UnixMilli())
 	assert.NoError(t, err)
 	tracker.electedLock.Lock()
 	assert.Equal(t, replica, tracker.clusters[userID][cluster].elected.Replica)
@@ -1551,23 +1551,23 @@ func TestHATracker_UserSpecificTimeouts(t *testing.T) {
 
 	// Request after user-specific timeout should trigger an update
 	now = now.Add(userSpecificUpdateTimeout) // Beyond user-specific timeout
-	err = userTracker.updateKVStore(context.Background(), cluster, replica, now, now, now.UnixMilli(), false)
+	err = userTracker.updateKVStore(context.Background(), cluster, replica, now, now, now.UnixMilli())
 	assert.NoError(t, err)
 	tracker.electedLock.Lock()
 	assert.Equal(t, replica, tracker.clusters[userID][cluster].elected.Replica)
 	assert.Equal(t, now.UnixMilli(), tracker.clusters[userID][cluster].elected.ReceivedAt) // Timestamp is updated
 	tracker.electedLock.Unlock()
 
 	// Failover shouldn't happen before FailoverTimeout
-	err = userTracker.updateKVStore(context.Background(), cluster, otherReplica, now, now, now.UnixMilli(), false)
+	err = userTracker.updateKVStore(context.Background(), cluster, otherReplica, now, now, now.UnixMilli())
 	assert.NoError(t, err)
 	tracker.electedLock.Lock()
 	assert.Equal(t, replica, tracker.clusters[userID][cluster].elected.Replica)
 	tracker.electedLock.Unlock()
 
 	// After FailoverTimeout, new value should be set
 	now = now.Add(userSpecificFailoverTimeout)
-	err = userTracker.updateKVStore(context.Background(), cluster, otherReplica, now, now, now.UnixMilli(), false)
+	err = userTracker.updateKVStore(context.Background(), cluster, otherReplica, now, now, now.UnixMilli())
 	assert.NoError(t, err)
 	tracker.electedLock.Lock()
 	assert.Equal(t, otherReplica, tracker.clusters[userID][cluster].elected.Replica)