per-replica EveryN

cockroachdb · Mar 14, 2023 · e005c0f · e005c0f
1 parent 02f8eaf
commit e005c0f
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/pkg/kv/kvserver/replica.go b/pkg/kv/kvserver/replica.go
@@ -167,6 +167,7 @@ type raftSparseStatus struct {
 // integrity by replacing failed replicas, splitting and merging
 // as appropriate.
 type Replica struct {
+	logUnstableN log.EveryN
 	// A replica's AmbientCtx includes the log tags from the parent node and
 	// store.
 	log.AmbientContext

diff --git a/pkg/kv/kvserver/replica_init.go b/pkg/kv/kvserver/replica_init.go
@@ -82,6 +82,7 @@ func newUninitializedReplica(
 ) *Replica {
 	uninitState := stateloader.UninitializedReplicaState(rangeID)
 	r := &Replica{
+		logUnstableN:   log.Every(time.Second),
 		AmbientContext: store.cfg.AmbientCtx,
 		RangeID:        rangeID,
 		replicaID:      replicaID,

diff --git a/pkg/kv/kvserver/replica_proposal_buf.go b/pkg/kv/kvserver/replica_proposal_buf.go
@@ -14,7 +14,6 @@ import (
 	"context"
 	"sync"
 	"sync/atomic"
-	"time"
 
 	"github.com/cockroachdb/cockroach/pkg/kv/kvpb"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/closedts/tracker"
@@ -901,8 +900,6 @@ func (b *propBuf) forwardClosedTimestampLocked(closedTS hlc.Timestamp) bool {
 	return b.assignedClosedTimestamp.Forward(closedTS)
 }
 
-var logUnstableN = log.Every(time.Second)
-
 func proposeBatch(raftGroup proposerRaft, replID roachpb.ReplicaID, ents []raftpb.Entry) error {
 	if len(ents) == 0 {
 		return nil

diff --git a/pkg/kv/kvserver/replica_raft.go b/pkg/kv/kvserver/replica_raft.go
@@ -775,7 +775,7 @@ func (r *Replica) handleRaftReadyRaftMuLocked(
 			{
 				count, bytes := raftGroup.UnstableLogStats()
 				const mb = 1 << 20
-				if bytes > 50*mb && logUnstableN.ShouldLog() {
+				if bytes > 50*mb && r.logUnstableN.ShouldLog() {
 					log.Infof(ctx, "r%d: unstable log #%d/%s", r.RangeID, count, humanizeutil.IBytes(bytes))
 				}
 			}

diff --git a/pkg/kv/kvserver/store.go b/pkg/kv/kvserver/store.go
@@ -2881,7 +2881,7 @@ func (s *Store) updateReplicationGauges(ctx context.Context) error {
 				fmt.Fprintf(&buf, ", ")
 			}
 		}
-		log.Infof(ctx, "recv-queues: %s", buf)
+		log.Infof(ctx, "recv-queues: %s", &buf)
 	}
 
 	newStoreReplicaVisitor(s).Visit(func(rep *Replica) bool {