Update kv/transaction.go

bootjp · Copilot · web-flow · commit 7a19ec0660d2 · 2026-04-01T21:37:37.000+09:00
Co-authored-by: Copilot &lt;175728472+Copilot@users.noreply.github.com&gt;
diff --git a/kv/transaction.go b/kv/transaction.go
@@ -232,11 +232,11 @@ func needsTxnCleanup(reqs []*pb.Request) bool {
 		if req == nil || !req.IsTxn {
 			continue
 		}
-		switch req.Phase {
-		case pb.Phase_PREPARE, pb.Phase_COMMIT:
+		// Be conservative: any transactional phase other than NONE/ABORT may have
+		// left intents that require cleanup, including unknown enum values that
+		// can appear during rolling upgrades.
+		if req.Phase != pb.Phase_NONE && req.Phase != pb.Phase_ABORT {
 			return true
-		case pb.Phase_NONE, pb.Phase_ABORT:
-			continue
 		}
 	}
 	return false

Original file line number	Diff line number	Diff line change
`@@ -232,11 +232,11 @@ func needsTxnCleanup(reqs []*pb.Request) bool {`
`232`	`232`	`if req == nil \|\| !req.IsTxn {`
`233`	`233`	`continue`
`234`	`234`	`}`
`235`		`- switch req.Phase {`
`236`		`- case pb.Phase_PREPARE, pb.Phase_COMMIT:`
	`235`	`+ // Be conservative: any transactional phase other than NONE/ABORT may have`
	`236`	`+ // left intents that require cleanup, including unknown enum values that`
	`237`	`+ // can appear during rolling upgrades.`
	`238`	`+ if req.Phase != pb.Phase_NONE && req.Phase != pb.Phase_ABORT {`
`237`	`239`	`return true`
`238`		`- case pb.Phase_NONE, pb.Phase_ABORT:`
`239`		`- continue`
`240`	`240`	`}`
`241`	`241`	`}`
`242`	`242`	`return false`