Skip to content

Commit d6c45e3

Browse files
authored
kv: update logs (#2307)
1 parent bd02505 commit d6c45e3

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

kv/txn.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ import (
2525
// RunInNewTxn will run the f in a new transaction environment.
2626
func RunInNewTxn(store Storage, retryable bool, f func(txn Transaction) error) error {
2727
var (
28-
err error
29-
txn Transaction
28+
err error
29+
originalTxnTS uint64
30+
txn Transaction
3031
)
3132
for i := 0; i < maxRetryCnt; i++ {
3233
txn, err = store.Begin()
@@ -35,9 +36,13 @@ func RunInNewTxn(store Storage, retryable bool, f func(txn Transaction) error) e
3536
return errors.Trace(err)
3637
}
3738

39+
if i == 0 {
40+
originalTxnTS = txn.StartTS()
41+
}
42+
3843
err = f(txn)
3944
if retryable && IsRetryableError(err) {
40-
log.Warnf("[kv] Retry txn %v", txn)
45+
log.Warnf("[kv] Retry txn %v original txn %v err %v", txn, originalTxnTS, err)
4146
txn.Rollback()
4247
continue
4348
}
@@ -48,7 +53,7 @@ func RunInNewTxn(store Storage, retryable bool, f func(txn Transaction) error) e
4853

4954
err = txn.Commit()
5055
if retryable && IsRetryableError(err) {
51-
log.Warnf("[kv] Retry txn %v", txn)
56+
log.Warnf("[kv] Retry txn %v original txn %v err %v", txn, originalTxnTS, err)
5257
txn.Rollback()
5358
BackOff(i)
5459
continue

0 commit comments

Comments
 (0)