Skip to content

Commit e8684fa

Browse files
committed
kvserver: rename shouldLog to maybeLog and change vlevel to a var
This commit renames shouldLog to maybeLog in maybeEnqueueProblemRange and refactors vmodule logging level to use a dynamic variable instead of an if statement to choose between Info and VInfo.
1 parent 4dab0d8 commit e8684fa

File tree

2 files changed

+18
-34
lines changed

2 files changed

+18
-34
lines changed

pkg/kv/kvserver/replica.go

Lines changed: 15 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2918,7 +2918,7 @@ func (r *Replica) TestingRefreshLeaderlessWatcherUnavailableState(
29182918
// manner via the replica scanner, see #130199. This functionality is disabled
29192919
// by default for this reason.
29202920
func (r *Replica) maybeEnqueueProblemRange(
2921-
ctx context.Context, now time.Time, leaseValid, isLeaseholder bool, shouldLog bool,
2921+
ctx context.Context, now time.Time, leaseValid, isLeaseholder bool, maybeLog bool,
29222922
) {
29232923

29242924
// The method expects the caller to provide whether the lease is valid and
@@ -2959,44 +2959,28 @@ func (r *Replica) maybeEnqueueProblemRange(
29592959
r.store.metrics.DecommissioningNudgerEnqueue.Inc(1)
29602960
// TODO(dodeca12): Figure out a better way to track the
29612961
// decommissioning nudger enqueue failures/errors.
2962+
level := log.Level(2)
2963+
if maybeLog {
2964+
level = log.Level(0)
2965+
}
29622966
r.store.replicateQueue.AddAsyncWithCallback(ctx, r,
29632967
allocatorimpl.AllocatorReplaceDecommissioningVoter.Priority(), processCallback{
29642968
onEnqueueResult: func(indexOnHeap int, err error) {
2965-
if shouldLog {
2966-
if err != nil {
2967-
log.KvDistribution.Infof(ctx,
2968-
"decommissioning nudger failed to enqueue range %v due to %v", r.Desc(), err)
2969-
} else {
2970-
log.KvDistribution.Infof(ctx,
2971-
"decommissioning nudger successfully enqueued range %v at index %d", r.Desc(), indexOnHeap)
2972-
}
2969+
if err != nil {
2970+
log.KvDistribution.VInfof(ctx, level,
2971+
"decommissioning nudger failed to enqueue range %v due to %v", r.Desc(), err)
29732972
} else {
2974-
if err != nil {
2975-
log.KvDistribution.VInfof(ctx, 2,
2976-
"decommissioning nudger failed to enqueue range %v due to %v", r.Desc(), err)
2977-
} else {
2978-
log.KvDistribution.VInfof(ctx, 2,
2979-
"decommissioning nudger successfully enqueued range %v at index %d", r.Desc(), indexOnHeap)
2980-
}
2973+
log.KvDistribution.VInfof(ctx, level,
2974+
"decommissioning nudger successfully enqueued range %v at index %d", r.Desc(), indexOnHeap)
29812975
}
29822976
},
29832977
onProcessResult: func(err error) {
2984-
if shouldLog {
2985-
if err != nil {
2986-
log.KvDistribution.Infof(ctx,
2987-
"decommissioning nudger failed to process range %v due to %v", r.Desc(), err)
2988-
} else {
2989-
log.KvDistribution.Infof(ctx,
2990-
"decommissioning nudger successfully processed replica %s", r.Desc())
2991-
}
2978+
if err != nil {
2979+
log.KvDistribution.VInfof(ctx, level,
2980+
"decommissioning nudger failed to process range %v due to %v", r.Desc(), err)
29922981
} else {
2993-
if err != nil {
2994-
log.KvDistribution.VInfof(ctx, 2,
2995-
"decommissioning nudger failed to process range %v due to %v", r.Desc(), err)
2996-
} else {
2997-
log.KvDistribution.VInfof(ctx, 2,
2998-
"decommissioning nudger successfully processed replica %s", r.Desc())
2999-
}
2982+
log.KvDistribution.VInfof(ctx, level,
2983+
"decommissioning nudger successfully processed replica %s", r.Desc())
30002984
}
30012985
},
30022986
})

pkg/kv/kvserver/store.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3494,11 +3494,11 @@ func (s *Store) updateReplicationGauges(ctx context.Context) error {
34943494
if metrics.Decommissioning {
34953495
// NB: Enqueue is disabled by default from here and throttled async if
34963496
// enabled.
3497-
shouldLog := logBudgetOnDecommissioningNudger > 0
3498-
if shouldLog {
3497+
maybeLog := logBudgetOnDecommissioningNudger > 0
3498+
if maybeLog {
34993499
logBudgetOnDecommissioningNudger--
35003500
}
3501-
rep.maybeEnqueueProblemRange(ctx, goNow, metrics.LeaseValid, metrics.Leaseholder, shouldLog)
3501+
rep.maybeEnqueueProblemRange(ctx, goNow, metrics.LeaseValid, metrics.Leaseholder, maybeLog)
35023502
decommissioningRangeCount++
35033503
}
35043504
}

0 commit comments

Comments
 (0)