Skip to content

Commit a9194dc

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 af9aa95 commit a9194dc

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
@@ -2867,7 +2867,7 @@ func (r *Replica) RefreshLeaderlessWatcherUnavailableStateForTesting(
28672867
// manner via the replica scanner, see #130199. This functionality is disabled
28682868
// by default for this reason.
28692869
func (r *Replica) maybeEnqueueProblemRange(
2870-
ctx context.Context, now time.Time, leaseValid, isLeaseholder bool, shouldLog bool,
2870+
ctx context.Context, now time.Time, leaseValid, isLeaseholder bool, maybeLog bool,
28712871
) {
28722872

28732873
// The method expects the caller to provide whether the lease is valid and
@@ -2908,44 +2908,28 @@ func (r *Replica) maybeEnqueueProblemRange(
29082908
r.store.metrics.DecommissioningNudgerEnqueue.Inc(1)
29092909
// TODO(dodeca12): Figure out a better way to track the
29102910
// decommissioning nudger enqueue failures/errors.
2911+
level := log.Level(2)
2912+
if maybeLog {
2913+
level = log.Level(0)
2914+
}
29112915
r.store.replicateQueue.AddAsyncWithCallback(ctx, r,
29122916
allocatorimpl.AllocatorReplaceDecommissioningVoter.Priority(), processCallback{
29132917
onEnqueueResult: func(indexOnHeap int, err error) {
2914-
if shouldLog {
2915-
if err != nil {
2916-
log.KvDistribution.Infof(ctx,
2917-
"decommissioning nudger failed to enqueue range %v due to %v", r.Desc(), err)
2918-
} else {
2919-
log.KvDistribution.Infof(ctx,
2920-
"decommissioning nudger successfully enqueued range %v at index %d", r.Desc(), indexOnHeap)
2921-
}
2918+
if err != nil {
2919+
log.KvDistribution.VInfof(ctx, level,
2920+
"decommissioning nudger failed to enqueue range %v due to %v", r.Desc(), err)
29222921
} else {
2923-
if err != nil {
2924-
log.KvDistribution.VInfof(ctx, 2,
2925-
"decommissioning nudger failed to enqueue range %v due to %v", r.Desc(), err)
2926-
} else {
2927-
log.KvDistribution.VInfof(ctx, 2,
2928-
"decommissioning nudger successfully enqueued range %v at index %d", r.Desc(), indexOnHeap)
2929-
}
2922+
log.KvDistribution.VInfof(ctx, level,
2923+
"decommissioning nudger successfully enqueued range %v at index %d", r.Desc(), indexOnHeap)
29302924
}
29312925
},
29322926
onProcessResult: func(err error) {
2933-
if shouldLog {
2934-
if err != nil {
2935-
log.KvDistribution.Infof(ctx,
2936-
"decommissioning nudger failed to process range %v due to %v", r.Desc(), err)
2937-
} else {
2938-
log.KvDistribution.Infof(ctx,
2939-
"decommissioning nudger successfully processed replica %s", r.Desc())
2940-
}
2927+
if err != nil {
2928+
log.KvDistribution.VInfof(ctx, level,
2929+
"decommissioning nudger failed to process range %v due to %v", r.Desc(), err)
29412930
} else {
2942-
if err != nil {
2943-
log.KvDistribution.VInfof(ctx, 2,
2944-
"decommissioning nudger failed to process range %v due to %v", r.Desc(), err)
2945-
} else {
2946-
log.KvDistribution.VInfof(ctx, 2,
2947-
"decommissioning nudger successfully processed replica %s", r.Desc())
2948-
}
2931+
log.KvDistribution.VInfof(ctx, level,
2932+
"decommissioning nudger successfully processed replica %s", r.Desc())
29492933
}
29502934
},
29512935
})

pkg/kv/kvserver/store.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3478,11 +3478,11 @@ func (s *Store) updateReplicationGauges(ctx context.Context) error {
34783478
if metrics.Decommissioning {
34793479
// NB: Enqueue is disabled by default from here and throttled async if
34803480
// enabled.
3481-
shouldLog := logBudgetOnDecommissioningNudger > 0
3482-
if shouldLog {
3481+
maybeLog := logBudgetOnDecommissioningNudger > 0
3482+
if maybeLog {
34833483
logBudgetOnDecommissioningNudger--
34843484
}
3485-
rep.maybeEnqueueProblemRange(ctx, goNow, metrics.LeaseValid, metrics.Leaseholder, shouldLog)
3485+
rep.maybeEnqueueProblemRange(ctx, goNow, metrics.LeaseValid, metrics.Leaseholder, maybeLog)
34863486
decommissioningRangeCount++
34873487
}
34883488
}

0 commit comments

Comments
 (0)