batcheval: move all log lines from Dev to KvExec

arulajmani · arulajmani · commit fd35fe393507 · 2025-09-22T13:20:30.000-04:00
Epic: none

Release note: None
diff --git a/pkg/kv/kvserver/batcheval/cmd_add_sstable.go b/pkg/kv/kvserver/batcheval/cmd_add_sstable.go
@@ -475,7 +475,7 @@ func computeSSTStatsDiffWithFallback(
 	stats, err := storage.ComputeSSTStatsDiff(
 		ctx, sst, readWriter, nowNanos, start, end)
 	if errors.IsAny(err, storage.ComputeSSTStatsDiffReaderHasRangeKeys, storage.ComputeStatsDiffViolation) {
-		log.Dev.Warningf(ctx, "computing SST stats as estimates because of ComputeSSTStatsDiff error: %s", err)
+		log.KvExec.Warningf(ctx, "computing SST stats as estimates because of ComputeSSTStatsDiff error: %s", err)
 		sstStats, err := computeSSTStats(ctx, sst, nowNanos)
 		if err != nil {
 			return enginepb.MVCCStats{}, errors.Wrap(err, "error computing SST stats during fallback")
diff --git a/pkg/kv/kvserver/batcheval/cmd_clear_range.go b/pkg/kv/kvserver/batcheval/cmd_clear_range.go
@@ -201,7 +201,7 @@ func computeStatsDelta(
 			// We only want to assert the correctness of stats that do not contain
 			// estimates.
 			if delta.ContainsEstimates == 0 && !delta.Equal(computed) {
-				log.Dev.Fatalf(ctx, "fast-path MVCCStats computation gave wrong result: diff(fast, computed) = %s",
+				log.KvExec.Fatalf(ctx, "fast-path MVCCStats computation gave wrong result: diff(fast, computed) = %s",
 					pretty.Diff(delta, computed))
 			}
 		}
diff --git a/pkg/kv/kvserver/batcheval/cmd_end_transaction.go b/pkg/kv/kvserver/batcheval/cmd_end_transaction.go
@@ -833,7 +833,7 @@ func updateFinalizedTxn(
 	opts := storage.MVCCWriteOptions{Stats: ms, Category: fs.BatchEvalReadCategory}
 	if !evalCtx.EvalKnobs().DisableTxnAutoGC && len(externalLocks) == 0 {
 		if log.V(2) {
-			log.Dev.Infof(ctx, "auto-gc'ed %s (%d locks)", txn.Short(), len(args.LockSpans))
+			log.KvExec.Infof(ctx, "auto-gc'ed %s (%d locks)", txn.Short(), len(args.LockSpans))
 		}
 		if !recordAlreadyExisted {
 			// Nothing to delete, so there's no use writing a deletion tombstone. This
@@ -956,7 +956,7 @@ func RunCommitTrigger(
 		return res, nil
 	}
 
-	log.Dev.Fatalf(ctx, "unknown commit trigger: %+v", ct)
+	log.KvExec.Fatalf(ctx, "unknown commit trigger: %+v", ct)
 	return result.Result{}, nil
 }
 
@@ -1400,7 +1400,7 @@ func splitTriggerHelper(
 			return enginepb.MVCCStats{}, result.Result{}, errors.Wrap(err, "unable to load lease")
 		}
 		if leftLease.Empty() {
-			log.Dev.Fatalf(ctx, "LHS of split has no lease")
+			log.KvExec.Fatalf(ctx, "LHS of split has no lease")
 		}
 
 		// Copy the lease from the left-hand side of the split over to the
diff --git a/pkg/kv/kvserver/batcheval/cmd_export.go b/pkg/kv/kvserver/batcheval/cmd_export.go
@@ -108,7 +108,7 @@ func evalExport(
 		return result.Result{}, err
 	}
 	if excludeFromBackup {
-		log.Dev.Infof(ctx, "[%s, %s) is part of a table excluded from backup, returning empty ExportResponse", args.Key, args.EndKey)
+		log.KvExec.Infof(ctx, "[%s, %s) is part of a table excluded from backup, returning empty ExportResponse", args.Key, args.EndKey)
 		return result.Result{}, nil
 	}
 
@@ -292,7 +292,7 @@ func evalExport(
 							return result.Result{}, errors.AssertionFailedf("ExportRequest exited without " +
 								"exporting any data for an unknown reason; programming error")
 						} else {
-							log.Dev.Warningf(ctx, "unexpected resume span from ExportRequest without exporting any data for an unknown reason: %v", resumeInfo)
+							log.KvExec.Warningf(ctx, "unexpected resume span from ExportRequest without exporting any data for an unknown reason: %v", resumeInfo)
 						}
 					}
 					start = resumeInfo.ResumeKey.Key
diff --git a/pkg/kv/kvserver/batcheval/cmd_get.go b/pkg/kv/kvserver/batcheval/cmd_get.go
@@ -112,7 +112,7 @@ func Get(
 			case 1:
 				reply.IntentValue = &intentVals[0].Value
 			default:
-				log.Dev.Fatalf(ctx, "more than 1 intent on single key: %v", intentVals)
+				log.KvExec.Fatalf(ctx, "more than 1 intent on single key: %v", intentVals)
 			}
 		}
 	}
diff --git a/pkg/kv/kvserver/batcheval/cmd_lease.go b/pkg/kv/kvserver/batcheval/cmd_lease.go
@@ -76,7 +76,7 @@ func evalNewLease(
 			acquisitions, approxSize := rec.GetConcurrencyManager().OnRangeLeaseTransferEval()
 			log.VEventf(ctx, 2, "upgrading durability of %d locks", len(acquisitions))
 			if approxSize > durabilityUpgradeLimit {
-				log.Dev.Warningf(ctx,
+				log.KvExec.Warningf(ctx,
 					"refusing to upgrade lock durability of %d locks since approximate lock size of %d byte exceeds %d bytes",
 					len(acquisitions),
 					approxSize,
diff --git a/pkg/kv/kvserver/batcheval/cmd_lease_request.go b/pkg/kv/kvserver/batcheval/cmd_lease_request.go
@@ -91,7 +91,7 @@ func RequestLease(
 		// Forwarding the lease's (minimum) expiration is safe because we know that
 		// the lease's sequence number has been incremented. Assert this.
 		if newLease.Sequence <= prevLease.Sequence {
-			log.Dev.Fatalf(ctx, "lease sequence not incremented: prev=%s, new=%s", prevLease, newLease)
+			log.KvExec.Fatalf(ctx, "lease sequence not incremented: prev=%s, new=%s", prevLease, newLease)
 		}
 	}
 
diff --git a/pkg/kv/kvserver/batcheval/cmd_lease_transfer.go b/pkg/kv/kvserver/batcheval/cmd_lease_transfer.go
@@ -108,7 +108,7 @@ func TransferLease(
 	// Forwarding the lease's start time is safe because we know that the
 	// lease's sequence number has been incremented. Assert this.
 	if newLease.Sequence <= prevLease.Sequence {
-		log.Dev.Fatalf(ctx, "lease sequence not incremented: prev=%s, new=%s", prevLease, newLease)
+		log.KvExec.Fatalf(ctx, "lease sequence not incremented: prev=%s, new=%s", prevLease, newLease)
 	}
 
 	log.VEventf(ctx, 2, "lease transfer: prev lease: %+v, new lease: %+v", prevLease, newLease)
diff --git a/pkg/kv/kvserver/batcheval/cmd_push_txn.go b/pkg/kv/kvserver/batcheval/cmd_push_txn.go
@@ -244,7 +244,7 @@ func PushTxn(
 		if !pusherWins {
 			s = "failed to push"
 		}
-		log.Dev.Infof(ctx, "%s %s (push type=%s) %s: %s (pushee last active: %s)",
+		log.KvExec.Infof(ctx, "%s %s (push type=%s) %s: %s (pushee last active: %s)",
 			args.PusherTxn.Short(), redact.Safe(s),
 			redact.Safe(pushType),
 			args.PusheeTxn.Short(),
@@ -288,7 +288,7 @@ func PushTxn(
 	// if initiated by a PUSH_TIMESTAMP.
 	if pusheeStaging && pusherWins && pushType == kvpb.PUSH_TIMESTAMP {
 		if !pusheeStagingFailed && !build.IsRelease() {
-			log.Dev.Fatalf(ctx, "parallel commit must be known to have failed for push to succeed")
+			log.KvExec.Fatalf(ctx, "parallel commit must be known to have failed for push to succeed")
 		}
 		pushType = kvpb.PUSH_ABORT
 	}
diff --git a/pkg/kv/kvserver/batcheval/cmd_refresh.go b/pkg/kv/kvserver/batcheval/cmd_refresh.go
@@ -40,7 +40,7 @@ func Refresh(
 	if h.Timestamp != h.Txn.WriteTimestamp {
 		// We're expecting the read and write timestamp to have converged before the
 		// Refresh request was sent.
-		log.Dev.Fatalf(ctx, "expected provisional commit ts %s == read ts %s. txn: %s", h.Timestamp,
+		log.KvExec.Fatalf(ctx, "expected provisional commit ts %s == read ts %s. txn: %s", h.Timestamp,
 			h.Txn.WriteTimestamp, h.Txn)
 	}
 	refreshTo := h.Timestamp
diff --git a/pkg/kv/kvserver/batcheval/cmd_refresh_range.go b/pkg/kv/kvserver/batcheval/cmd_refresh_range.go
@@ -44,7 +44,7 @@ func RefreshRange(
 	if h.Timestamp != h.Txn.WriteTimestamp {
 		// We're expecting the read and write timestamp to have converged before the
 		// Refresh request was sent.
-		log.Dev.Fatalf(ctx, "expected provisional commit ts %s == read ts %s. txn: %s", h.Timestamp,
+		log.KvExec.Fatalf(ctx, "expected provisional commit ts %s == read ts %s. txn: %s", h.Timestamp,
 			h.Txn.WriteTimestamp, h.Txn)
 	}
 	refreshTo := h.Timestamp
diff --git a/pkg/kv/kvserver/batcheval/cmd_subsume.go b/pkg/kv/kvserver/batcheval/cmd_subsume.go
@@ -188,7 +188,7 @@ func Subsume(
 		durabilityUpgradeLimit := concurrency.GetMaxLockFlushSize(&cArgs.EvalCtx.ClusterSettings().SV)
 		acquisitions, approxSize := cArgs.EvalCtx.GetConcurrencyManager().OnRangeSubsumeEval()
 		if approxSize > durabilityUpgradeLimit {
-			log.Dev.Warningf(ctx,
+			log.KvExec.Warningf(ctx,
 				"refusing to upgrade lock durability of %d locks since approximate lock size of %d byte exceeds %d bytes",
 				len(acquisitions),
 				approxSize,
diff --git a/pkg/kv/kvserver/batcheval/cmd_truncate_log.go b/pkg/kv/kvserver/batcheval/cmd_truncate_log.go
@@ -51,7 +51,7 @@ func TruncateLog(
 	// the range specified in the request body.
 	rangeID := cArgs.EvalCtx.GetRangeID()
 	if rangeID != args.RangeID {
-		log.Dev.Infof(ctx, "attempting to truncate raft logs for another range: r%d. Normally this is due to a merge and can be ignored.",
+		log.KvExec.Infof(ctx, "attempting to truncate raft logs for another range: r%d. Normally this is due to a merge and can be ignored.",
 			args.RangeID)
 		return result.Result{}, nil
 	}
@@ -69,7 +69,7 @@ func TruncateLog(
 	firstIndex := cArgs.EvalCtx.GetCompactedIndex() + 1
 	if firstIndex >= args.Index {
 		if log.V(3) {
-			log.Dev.Infof(ctx, "attempting to truncate previously truncated raft log. FirstIndex:%d, TruncateFrom:%d",
+			log.KvExec.Infof(ctx, "attempting to truncate previously truncated raft log. FirstIndex:%d, TruncateFrom:%d",
 				firstIndex, args.Index)
 		}
 		return result.Result{}, nil
diff --git a/pkg/kv/kvserver/batcheval/command.go b/pkg/kv/kvserver/batcheval/command.go
@@ -101,7 +101,7 @@ func RegisterReadOnlyCommand(
 
 func register(method kvpb.Method, command Command) {
 	if !cmds[method].isEmpty() {
-		log.Dev.Fatalf(context.TODO(), "cannot overwrite previously registered method %v", method)
+		log.KvExec.Fatalf(context.TODO(), "cannot overwrite previously registered method %v", method)
 	}
 	cmds[method] = command
 }
diff --git a/pkg/kv/kvserver/batcheval/lock.go b/pkg/kv/kvserver/batcheval/lock.go
@@ -54,7 +54,7 @@ func CollectIntentRows(
 		if err != nil {
 			if errors.HasType(err, (*kvpb.LockConflictError)(nil)) ||
 				errors.HasType(err, (*kvpb.ReadWithinUncertaintyIntervalError)(nil)) {
-				log.Dev.Fatalf(ctx, "unexpected %T in CollectIntentRows: %+v", err, err)
+				log.KvExec.Fatalf(ctx, "unexpected %T in CollectIntentRows: %+v", err, err)
 			}
 			return nil, err
 		}
@@ -92,7 +92,7 @@ func readProvisionalVal(
 		return roachpb.KeyValue{}, err
 	}
 	if len(res.KVs) > 1 {
-		log.Dev.Fatalf(ctx, "multiple key-values returned from single-key scan: %+v", res.KVs)
+		log.KvExec.Fatalf(ctx, "multiple key-values returned from single-key scan: %+v", res.KVs)
 	} else if len(res.KVs) == 0 {
 		// Intent is a deletion.
 		return roachpb.KeyValue{}, nil
diff --git a/pkg/kv/kvserver/batcheval/result/result.go b/pkg/kv/kvserver/batcheval/result/result.go
@@ -304,7 +304,7 @@ func (p *Result) MergeAndDestroy(q Result) error {
 			return errors.AssertionFailedf("must not specify ForceFlushIndex")
 		}
 		if (*q.Replicated.State != kvserverpb.ReplicaState{}) {
-			log.Dev.Fatalf(context.TODO(), "unhandled EvalResult: %s",
+			log.KvExec.Fatalf(context.TODO(), "unhandled EvalResult: %s",
 				pretty.Diff(*q.Replicated.State, kvserverpb.ReplicaState{}))
 		}
 		q.Replicated.State = nil
@@ -499,7 +499,7 @@ func (p *Result) MergeAndDestroy(q Result) error {
 	q.LogicalOpLog = nil
 
 	if !q.IsZero() {
-		log.Dev.Fatalf(context.TODO(), "unhandled EvalResult: %s", pretty.Diff(q, Result{}))
+		log.KvExec.Fatalf(context.TODO(), "unhandled EvalResult: %s", pretty.Diff(q, Result{}))
 	}
 
 	return nil
diff --git a/pkg/kv/kvserver/batcheval/transaction.go b/pkg/kv/kvserver/batcheval/transaction.go
@@ -138,7 +138,7 @@ func CanCreateTxnRecord(ctx context.Context, rec EvalContext, txn *roachpb.Trans
 // be PENDING.
 func BumpToMinTxnCommitTS(ctx context.Context, rec EvalContext, txn *roachpb.Transaction) {
 	if txn.Status != roachpb.PENDING {
-		log.Dev.Fatalf(ctx, "non-pending txn passed to BumpToMinTxnCommitTS: %v", txn)
+		log.KvExec.Fatalf(ctx, "non-pending txn passed to BumpToMinTxnCommitTS: %v", txn)
 	}
 	minCommitTS := rec.MinTxnCommitTS(ctx, txn.ID, txn.Key)
 	if bumped := txn.WriteTimestamp.Forward(minCommitTS); bumped {

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ func computeStatsDelta(`
`201`	`201`	`// We only want to assert the correctness of stats that do not contain`
`202`	`202`	`// estimates.`
`203`	`203`	`if delta.ContainsEstimates == 0 && !delta.Equal(computed) {`
`204`		`- log.Dev.Fatalf(ctx, "fast-path MVCCStats computation gave wrong result: diff(fast, computed) = %s",`
	`204`	`+ log.KvExec.Fatalf(ctx, "fast-path MVCCStats computation gave wrong result: diff(fast, computed) = %s",`
`205`	`205`	`pretty.Diff(delta, computed))`
`206`	`206`	`}`
`207`	`207`	`}`
Original file line number	Diff line number	Diff line change
`@@ -833,7 +833,7 @@ func updateFinalizedTxn(`
`833`	`833`	`opts := storage.MVCCWriteOptions{Stats: ms, Category: fs.BatchEvalReadCategory}`
`834`	`834`	`if !evalCtx.EvalKnobs().DisableTxnAutoGC && len(externalLocks) == 0 {`
`835`	`835`	`if log.V(2) {`
`836`		`- log.Dev.Infof(ctx, "auto-gc'ed %s (%d locks)", txn.Short(), len(args.LockSpans))`
	`836`	`+ log.KvExec.Infof(ctx, "auto-gc'ed %s (%d locks)", txn.Short(), len(args.LockSpans))`
`837`	`837`	`}`
`838`	`838`	`if !recordAlreadyExisted {`
`839`	`839`	`// Nothing to delete, so there's no use writing a deletion tombstone. This`
`@@ -956,7 +956,7 @@ func RunCommitTrigger(`
`956`	`956`	`return res, nil`
`957`	`957`	`}`
`958`	`958`
`959`		`- log.Dev.Fatalf(ctx, "unknown commit trigger: %+v", ct)`
	`959`	`+ log.KvExec.Fatalf(ctx, "unknown commit trigger: %+v", ct)`
`960`	`960`	`return result.Result{}, nil`
`961`	`961`	`}`
`962`	`962`
`@@ -1400,7 +1400,7 @@ func splitTriggerHelper(`
`1400`	`1400`	`return enginepb.MVCCStats{}, result.Result{}, errors.Wrap(err, "unable to load lease")`
`1401`	`1401`	`}`
`1402`	`1402`	`if leftLease.Empty() {`
`1403`		`- log.Dev.Fatalf(ctx, "LHS of split has no lease")`
	`1403`	`+ log.KvExec.Fatalf(ctx, "LHS of split has no lease")`
`1404`	`1404`	`}`
`1405`	`1405`
`1406`	`1406`	`// Copy the lease from the left-hand side of the split over to the`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ func evalExport(`
`108`	`108`	`return result.Result{}, err`
`109`	`109`	`}`
`110`	`110`	`if excludeFromBackup {`
`111`		`- log.Dev.Infof(ctx, "[%s, %s) is part of a table excluded from backup, returning empty ExportResponse", args.Key, args.EndKey)`
	`111`	`+ log.KvExec.Infof(ctx, "[%s, %s) is part of a table excluded from backup, returning empty ExportResponse", args.Key, args.EndKey)`
`112`	`112`	`return result.Result{}, nil`
`113`	`113`	`}`
`114`	`114`
`@@ -292,7 +292,7 @@ func evalExport(`
`292`	`292`	`return result.Result{}, errors.AssertionFailedf("ExportRequest exited without " +`
`293`	`293`	`"exporting any data for an unknown reason; programming error")`
`294`	`294`	`} else {`
`295`		`- log.Dev.Warningf(ctx, "unexpected resume span from ExportRequest without exporting any data for an unknown reason: %v", resumeInfo)`
	`295`	`+ log.KvExec.Warningf(ctx, "unexpected resume span from ExportRequest without exporting any data for an unknown reason: %v", resumeInfo)`
`296`	`296`	`}`
`297`	`297`	`}`
`298`	`298`	`start = resumeInfo.ResumeKey.Key`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ func Get(`
`112`	`112`	`case 1:`
`113`	`113`	`reply.IntentValue = &intentVals[0].Value`
`114`	`114`	`default:`
`115`		`- log.Dev.Fatalf(ctx, "more than 1 intent on single key: %v", intentVals)`
	`115`	`+ log.KvExec.Fatalf(ctx, "more than 1 intent on single key: %v", intentVals)`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ func RequestLease(`
`91`	`91`	`// Forwarding the lease's (minimum) expiration is safe because we know that`
`92`	`92`	`// the lease's sequence number has been incremented. Assert this.`
`93`	`93`	`if newLease.Sequence <= prevLease.Sequence {`
`94`		`- log.Dev.Fatalf(ctx, "lease sequence not incremented: prev=%s, new=%s", prevLease, newLease)`
	`94`	`+ log.KvExec.Fatalf(ctx, "lease sequence not incremented: prev=%s, new=%s", prevLease, newLease)`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ func TransferLease(`
`108`	`108`	`// Forwarding the lease's start time is safe because we know that the`
`109`	`109`	`// lease's sequence number has been incremented. Assert this.`
`110`	`110`	`if newLease.Sequence <= prevLease.Sequence {`
`111`		`- log.Dev.Fatalf(ctx, "lease sequence not incremented: prev=%s, new=%s", prevLease, newLease)`
	`111`	`+ log.KvExec.Fatalf(ctx, "lease sequence not incremented: prev=%s, new=%s", prevLease, newLease)`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`log.VEventf(ctx, 2, "lease transfer: prev lease: %+v, new lease: %+v", prevLease, newLease)`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ func PushTxn(`
`244`	`244`	`if !pusherWins {`
`245`	`245`	`s = "failed to push"`
`246`	`246`	`}`
`247`		`- log.Dev.Infof(ctx, "%s %s (push type=%s) %s: %s (pushee last active: %s)",`
	`247`	`+ log.KvExec.Infof(ctx, "%s %s (push type=%s) %s: %s (pushee last active: %s)",`
`248`	`248`	`args.PusherTxn.Short(), redact.Safe(s),`
`249`	`249`	`redact.Safe(pushType),`
`250`	`250`	`args.PusheeTxn.Short(),`
`@@ -288,7 +288,7 @@ func PushTxn(`
`288`	`288`	`// if initiated by a PUSH_TIMESTAMP.`
`289`	`289`	`if pusheeStaging && pusherWins && pushType == kvpb.PUSH_TIMESTAMP {`
`290`	`290`	`if !pusheeStagingFailed && !build.IsRelease() {`
`291`		`- log.Dev.Fatalf(ctx, "parallel commit must be known to have failed for push to succeed")`
	`291`	`+ log.KvExec.Fatalf(ctx, "parallel commit must be known to have failed for push to succeed")`
`292`	`292`	`}`
`293`	`293`	`pushType = kvpb.PUSH_ABORT`
`294`	`294`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func Refresh(`
`40`	`40`	`if h.Timestamp != h.Txn.WriteTimestamp {`
`41`	`41`	`// We're expecting the read and write timestamp to have converged before the`
`42`	`42`	`// Refresh request was sent.`
`43`		`- log.Dev.Fatalf(ctx, "expected provisional commit ts %s == read ts %s. txn: %s", h.Timestamp,`
	`43`	`+ log.KvExec.Fatalf(ctx, "expected provisional commit ts %s == read ts %s. txn: %s", h.Timestamp,`
`44`	`44`	`h.Txn.WriteTimestamp, h.Txn)`
`45`	`45`	`}`
`46`	`46`	`refreshTo := h.Timestamp`