Skip to content

Commit 03c72e4

Browse files
committed
intentresolver: change logging channel
1 parent 0bf0610 commit 03c72e4

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

pkg/kv/kvserver/intentresolver/intent_resolver.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ func updateIntentTxnStatus(
339339
if !ok {
340340
// The intent was not pushed.
341341
if !skipIfInFlight {
342-
log.Dev.Fatalf(ctx, "no PushTxn response for intent %+v", intent)
342+
log.KvExec.Fatalf(ctx, "no PushTxn response for intent %+v", intent)
343343
}
344344
// It must have been skipped.
345345
continue
@@ -369,7 +369,7 @@ func (ir *IntentResolver) PushTransaction(
369369
}
370370
pushedTxn, ok := pushedTxns[pushTxn.ID]
371371
if !ok {
372-
log.Dev.Fatalf(ctx, "missing PushTxn responses for %s", pushTxn)
372+
log.KvExec.Fatalf(ctx, "missing PushTxn responses for %s", pushTxn)
373373
}
374374
return pushedTxn, ambiguousAbort, nil
375375
}
@@ -421,7 +421,7 @@ func (ir *IntentResolver) MaybePushTransactions(
421421
// Another goroutine is working on this transaction so we can
422422
// skip it.
423423
if log.V(1) {
424-
log.Dev.Infof(ctx, "skipping PushTxn for %s; attempt already in flight", txnID)
424+
log.KvExec.Infof(ctx, "skipping PushTxn for %s; attempt already in flight", txnID)
425425
}
426426
delete(pushTxns, txnID)
427427
} else {
@@ -476,7 +476,7 @@ func (ir *IntentResolver) MaybePushTransactions(
476476
txn := &resp.PusheeTxn
477477
anyAmbiguousAbort = anyAmbiguousAbort || resp.AmbiguousAbort
478478
if _, ok := pushedTxns[txn.ID]; ok {
479-
log.Dev.Fatalf(ctx, "have two PushTxn responses for %s", txn.ID)
479+
log.KvExec.Fatalf(ctx, "have two PushTxn responses for %s", txn.ID)
480480
}
481481
pushedTxns[txn.ID] = txn
482482
log.Eventf(ctx, "%s is now %s", txn.ID, txn.Status)
@@ -546,7 +546,7 @@ func (ir *IntentResolver) CleanupIntentsAsync(
546546
return err
547547
})
548548
if err != nil && ir.every.ShouldLog() {
549-
log.Dev.Warningf(ctx, "%v", err)
549+
log.KvExec.Warningf(ctx, "%v", err)
550550
}
551551
})
552552
}
@@ -664,7 +664,7 @@ func (ir *IntentResolver) CleanupTxnIntentsAsync(
664664
ctx, kv.AdmissionHeaderForLockUpdateForTxn(et.Txn), rangeID, et.Txn, et.Poison, onComplete,
665665
); err != nil {
666666
if ir.every.ShouldLog() {
667-
log.Dev.Warningf(ctx, "failed to cleanup transaction intents: %v", err)
667+
log.KvExec.Warningf(ctx, "failed to cleanup transaction intents: %v", err)
668668
}
669669
}
670670
}); err != nil {
@@ -784,7 +784,7 @@ func (ir *IntentResolver) CleanupTxnIntentsOnGCAsync(
784784
ctx, admissionHeader, rangeID, txn, false /* poison */, onCleanupComplete)
785785
if err != nil {
786786
if ir.every.ShouldLog() {
787-
log.Dev.Warningf(ctx, "failed to cleanup transaction intents: %+v", err)
787+
log.KvExec.Warningf(ctx, "failed to cleanup transaction intents: %+v", err)
788788
}
789789
}
790790
}(ctx)
@@ -887,7 +887,7 @@ func (ir *IntentResolver) cleanupFinishedTxnIntents(
887887
}
888888
if err != nil {
889889
if ir.every.ShouldLog() {
890-
log.Dev.Warningf(ctx, "failed to gc transaction record: %v", err)
890+
log.KvExec.Warningf(ctx, "failed to gc transaction record: %v", err)
891891
}
892892
}
893893
}(ctx)
@@ -937,14 +937,14 @@ func (ir *IntentResolver) lookupRangeID(ctx context.Context, key roachpb.Key) ro
937937
rKey, err := keys.Addr(key)
938938
if err != nil {
939939
if ir.every.ShouldLog() {
940-
log.Dev.Warningf(ctx, "failed to resolve addr for key %q: %+v", key, err)
940+
log.KvExec.Warningf(ctx, "failed to resolve addr for key %q: %+v", key, err)
941941
}
942942
return 0
943943
}
944944
rangeID, err := ir.rdc.LookupRangeID(ctx, rKey)
945945
if err != nil {
946946
if ir.every.ShouldLog() {
947-
log.Dev.Warningf(ctx, "failed to look up range descriptor for key %q: %+v", key, err)
947+
log.KvExec.Warningf(ctx, "failed to look up range descriptor for key %q: %+v", key, err)
948948
}
949949
return 0
950950
}
@@ -1068,7 +1068,7 @@ func (ir *IntentResolver) resolveIntents(
10681068
// TODO(aaditya): reconsider this once #112680 is resolved.
10691069
// if !build.IsRelease() && h == (kvpb.AdmissionHeader{}) && ir.everyAdmissionHeaderMissing.ShouldLog() {
10701070
if false {
1071-
log.Dev.Warningf(ctx,
1071+
log.KvExec.Warningf(ctx,
10721072
"test-only warning: if you see this, please report to https://github.com/cockroachdb/cockroach/issues/112680. empty admission header provided by %s", debugutil.Stack())
10731073
}
10741074
// Send the requests ...

0 commit comments

Comments
 (0)