merge master&fix conflicts

Signed-off-by: AndreMouche <[email protected]>
tikv · Jan 3, 2025 · bc5287d · bc5287d
1 parent 846f2d7
commit bc5287d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/txnkv/transaction/prewrite.go b/txnkv/transaction/prewrite.go
@@ -232,11 +232,11 @@ func (action actionPrewrite) handleSingleBatch(
 	}
 
 	handler := action.newSingleBatchPrewriteReqHandler(c, batch, bo)
-	defer handler.drop(err)
 
 	for {
 		retryable, err := handler.sendReqAndCheck()
 		if !retryable {
+			handler.drop(err)
 			return err
 		}
 	}