Skip to content

Commit d2b7365

Browse files
committed
gc: change logging channel
1 parent 5b38b5b commit d2b7365

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

pkg/kv/kvserver/gc/gc.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ func Run(
379379
if errors.Is(err, ctx.Err()) {
380380
return Info{}, err
381381
}
382-
log.Dev.Warningf(ctx, "while gc'ing local key range: %s", err)
382+
log.KvExec.Warningf(ctx, "while gc'ing local key range: %s", err)
383383
}
384384

385385
// Clean up the AbortSpan.
@@ -388,7 +388,7 @@ func Run(
388388
if errors.Is(err, ctx.Err()) {
389389
return Info{}, err
390390
}
391-
log.Dev.Warningf(ctx, "while gc'ing abort span: %s", err)
391+
log.KvExec.Warningf(ctx, "while gc'ing abort span: %s", err)
392392
}
393393

394394
log.Eventf(ctx, "GC'ed keys; stats %+v", info)
@@ -445,7 +445,7 @@ func processReplicatedKeyRange(
445445
excludeUserKeySpan = true
446446
info.ClearRangeSpanOperations++
447447
} else {
448-
log.Dev.Warningf(ctx, "failed to perform GC clear range operation on range %s: %s",
448+
log.KvExec.Warningf(ctx, "failed to perform GC clear range operation on range %s: %s",
449449
desc.String(), err)
450450
info.ClearRangeSpanFailures++
451451
}
@@ -580,7 +580,7 @@ func processReplicatedLocks(
580580
if errors.Is(err, ctx.Err()) {
581581
return err
582582
}
583-
log.Dev.Warningf(ctx, "failed to cleanup intents batch: %v", err)
583+
log.KvExec.Warningf(ctx, "failed to cleanup intents batch: %v", err)
584584
}
585585
}
586586
}
@@ -606,7 +606,7 @@ func processReplicatedLocks(
606606
if errors.Is(err, ctx.Err()) {
607607
return err
608608
}
609-
log.Dev.Warningf(ctx, "failed to cleanup intents batch: %v", err)
609+
log.KvExec.Warningf(ctx, "failed to cleanup intents batch: %v", err)
610610
}
611611
return nil
612612
}
@@ -934,7 +934,7 @@ func (b *gcKeyBatcher) maybeFlushPendingBatches(ctx context.Context) (err error)
934934
// safe to continue because we bumped the GC
935935
// thresholds. We may leave some inconsistent history
936936
// behind, but nobody can read it.
937-
log.Dev.Warningf(ctx, "failed to GC keys with clear range: %v", err)
937+
log.KvExec.Warningf(ctx, "failed to GC keys with clear range: %v", err)
938938
b.info.ClearRangeSpanFailures++
939939
}
940940
b.clearRangeCounters.updateGcInfo(b.info)
@@ -981,7 +981,7 @@ func (b *gcKeyBatcher) flushPointsBatch(ctx context.Context, batch *pointsBatch)
981981
// safe to continue because we bumped the GC
982982
// thresholds. We may leave some inconsistent history
983983
// behind, but nobody can read it.
984-
log.Dev.Warningf(ctx, "failed to GC a batch of keys: %v", err)
984+
log.KvExec.Warningf(ctx, "failed to GC a batch of keys: %v", err)
985985
}
986986
batch.gcBatchCounters.updateGcInfo(b.info)
987987
b.totalMemUsed -= batch.gcBatchCounters.memUsed
@@ -1194,7 +1194,7 @@ func processLocalKeyRange(
11941194
gcer PureGCer,
11951195
) error {
11961196
b := makeBatchingInlineGCer(gcer, func(err error) {
1197-
log.Dev.Warningf(ctx, "failed to GC from local key range: %s", err)
1197+
log.KvExec.Warningf(ctx, "failed to GC from local key range: %s", err)
11981198
})
11991199
defer b.Flush(ctx)
12001200

@@ -1286,7 +1286,7 @@ func processAbortSpan(
12861286
gcer PureGCer,
12871287
) error {
12881288
b := makeBatchingInlineGCer(gcer, func(err error) {
1289-
log.Dev.Warningf(ctx, "unable to GC from abort span: %s", err)
1289+
log.KvExec.Warningf(ctx, "unable to GC from abort span: %s", err)
12901290
})
12911291
defer b.Flush(ctx)
12921292
abortSpan := abortspan.New(rangeID)

pkg/kv/kvserver/gc/gc_random_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,9 +435,9 @@ func assertLiveData(
435435
// 1000 elements is ok, but 10k or 100k entries might become unreadable.
436436
if log.V(1) {
437437
ctx := context.Background()
438-
log.Dev.Info(ctx, "Expected data:")
438+
log.KvExec.Info(ctx, "Expected data:")
439439
for _, l := range formatTable(engineData(t, before, desc), desc.StartKey.AsRawKey()) {
440-
log.Dev.Infof(ctx, "%s", l)
440+
log.KvExec.Infof(ctx, "%s", l)
441441
}
442442
}
443443

pkg/kv/kvserver/gc/gc_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,14 +1145,14 @@ func runTest(t *testing.T, data testRunData, verify gcVerifier) {
11451145
expectedStats := dataItems.liveDistribution().setupTest(t, ctrlEng, desc)
11461146

11471147
if log.V(1) {
1148-
log.Dev.Info(ctx, "Expected data:")
1148+
log.KvExec.Info(ctx, "Expected data:")
11491149
for _, l := range formatTable(engineData(t, ctrlEng, desc), tablePrefix) {
1150-
log.Dev.Infof(ctx, "%s", l)
1150+
log.KvExec.Infof(ctx, "%s", l)
11511151
}
11521152

1153-
log.Dev.Info(ctx, "Actual data:")
1153+
log.KvExec.Info(ctx, "Actual data:")
11541154
for _, l := range formatTable(engineData(t, eng, desc), tablePrefix) {
1155-
log.Dev.Infof(ctx, "%s", l)
1155+
log.KvExec.Infof(ctx, "%s", l)
11561156
}
11571157
}
11581158

0 commit comments

Comments
 (0)