Skip to content

Commit 131cc9e

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 f83869f commit 131cc9e

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
@@ -2567,7 +2567,7 @@ func (r *Replica) GetMutexForTesting() *ReplicaMutex {
25672567
// manner via the replica scanner, see #130199. This functionality is disabled
25682568
// by default for this reason.
25692569
func (r *Replica) maybeEnqueueProblemRange(
2570-
ctx context.Context, now time.Time, leaseValid, isLeaseholder bool, shouldLog bool,
2570+
ctx context.Context, now time.Time, leaseValid, isLeaseholder bool, maybeLog bool,
25712571
) {
25722572

25732573
// The method expects the caller to provide whether the lease is valid and
@@ -2608,44 +2608,28 @@ func (r *Replica) maybeEnqueueProblemRange(
26082608
r.store.metrics.DecommissioningNudgerEnqueue.Inc(1)
26092609
// TODO(dodeca12): Figure out a better way to track the
26102610
// decommissioning nudger enqueue failures/errors.
2611+
level := log.Level(2)
2612+
if maybeLog {
2613+
level = log.Level(0)
2614+
}
26112615
r.store.replicateQueue.AddAsyncWithCallback(ctx, r,
26122616
allocatorimpl.AllocatorReplaceDecommissioningVoter.Priority(), processCallback{
26132617
onEnqueueResult: func(indexOnHeap int, err error) {
2614-
if shouldLog {
2615-
if err != nil {
2616-
log.KvDistribution.Infof(ctx,
2617-
"decommissioning nudger failed to enqueue range %v due to %v", r.Desc(), err)
2618-
} else {
2619-
log.KvDistribution.Infof(ctx,
2620-
"decommissioning nudger successfully enqueued range %v at index %d", r.Desc(), indexOnHeap)
2621-
}
2618+
if err != nil {
2619+
log.KvDistribution.VInfof(ctx, level,
2620+
"decommissioning nudger failed to enqueue range %v due to %v", r.Desc(), err)
26222621
} else {
2623-
if err != nil {
2624-
log.KvDistribution.VInfof(ctx, 2,
2625-
"decommissioning nudger failed to enqueue range %v due to %v", r.Desc(), err)
2626-
} else {
2627-
log.KvDistribution.VInfof(ctx, 2,
2628-
"decommissioning nudger successfully enqueued range %v at index %d", r.Desc(), indexOnHeap)
2629-
}
2622+
log.KvDistribution.VInfof(ctx, level,
2623+
"decommissioning nudger successfully enqueued range %v at index %d", r.Desc(), indexOnHeap)
26302624
}
26312625
},
26322626
onProcessResult: func(err error) {
2633-
if shouldLog {
2634-
if err != nil {
2635-
log.KvDistribution.Infof(ctx,
2636-
"decommissioning nudger failed to process range %v due to %v", r.Desc(), err)
2637-
} else {
2638-
log.KvDistribution.Infof(ctx,
2639-
"decommissioning nudger successfully processed replica %s", r.Desc())
2640-
}
2627+
if err != nil {
2628+
log.KvDistribution.VInfof(ctx, level,
2629+
"decommissioning nudger failed to process range %v due to %v", r.Desc(), err)
26412630
} else {
2642-
if err != nil {
2643-
log.KvDistribution.VInfof(ctx, 2,
2644-
"decommissioning nudger failed to process range %v due to %v", r.Desc(), err)
2645-
} else {
2646-
log.KvDistribution.VInfof(ctx, 2,
2647-
"decommissioning nudger successfully processed replica %s", r.Desc())
2648-
}
2631+
log.KvDistribution.VInfof(ctx, level,
2632+
"decommissioning nudger successfully processed replica %s", r.Desc())
26492633
}
26502634
},
26512635
})

pkg/kv/kvserver/store.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3423,11 +3423,11 @@ func (s *Store) updateReplicationGauges(ctx context.Context) error {
34233423
if metrics.Decommissioning {
34243424
// NB: Enqueue is disabled by default from here and throttled async if
34253425
// enabled.
3426-
shouldLog := logBudgetOnDecommissioningNudger > 0
3427-
if shouldLog {
3426+
maybeLog := logBudgetOnDecommissioningNudger > 0
3427+
if maybeLog {
34283428
logBudgetOnDecommissioningNudger--
34293429
}
3430-
rep.maybeEnqueueProblemRange(ctx, goNow, metrics.LeaseValid, metrics.Leaseholder, shouldLog)
3430+
rep.maybeEnqueueProblemRange(ctx, goNow, metrics.LeaseValid, metrics.Leaseholder, maybeLog)
34313431
decommissioningRangeCount++
34323432
}
34333433
}

0 commit comments

Comments
 (0)