Handle missing lock as conflict and abort transaction

bootjp · bootjp · commit 55ff1069d045 · 2025-12-27T21:11:20.000+09:00
diff --git a/kv/fsm.go b/kv/fsm.go
@@ -209,13 +209,8 @@ func (f *kvFSM) handleCommitRequest(ctx context.Context, r *pb.Request) error {
 				}
 
 				if !ok {
-					// Lock missing (e.g., expired). Try to reacquire to make progress.
-					err := f.lockStore.TxnWithTTL(ctx, func(ctx context.Context, ttlTxn store.TTLTxn) error {
-						return f.lock(ttlTxn, mut.Key, r.Ts)
-					})
-					if err != nil {
-						return errors.WithStack(err)
-					}
+					// Lock already gone: treat as conflict and abort.
+					return errors.WithStack(ErrKeyNotLocked)
 				}
 
 				err = f.commit(ctx, txn, mut)

Original file line number	Diff line number	Diff line change
`@@ -209,13 +209,8 @@ func (f kvFSM) handleCommitRequest(ctx context.Context, r pb.Request) error {`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`if !ok {`
`212`		`- // Lock missing (e.g., expired). Try to reacquire to make progress.`
`213`		`- err := f.lockStore.TxnWithTTL(ctx, func(ctx context.Context, ttlTxn store.TTLTxn) error {`
`214`		`- return f.lock(ttlTxn, mut.Key, r.Ts)`
`215`		`- })`
`216`		`- if err != nil {`
`217`		`- return errors.WithStack(err)`
`218`		`- }`
	`212`	`+ // Lock already gone: treat as conflict and abort.`
	`213`	`+ return errors.WithStack(ErrKeyNotLocked)`
`219`	`214`	`}`
`220`	`215`
`221`	`216`	`err = f.commit(ctx, txn, mut)`