Fix iscp executor #23415
Open
Fix iscp executor #23415
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jiangxinmeng1
force-pushed
the
fix_iscp_executor
branch
from
2d6aedc to
de27cb7
Compare
XuPeng-SH
approved these changes
Jan 5, 2026
Contributor
Merge Queue Status🚫 The pull request has left the queue (rule: This pull request spent 20 minutes 14 seconds in the queue, with no time running CI. Required conditions to merge
ReasonThe merge conditions cannot be satisfied due to failing checks HintYou may have to fix your CI before adding the pull request to the queue again. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
Which issue(s) this PR fixes:
issue #23414
What this PR does / why we need it:
Fix: Transaction broken during cluster snapshot restore
Problem: During cluster snapshot restore, each DDL operation commits separately instead of executing within a single transaction, breaking transaction atomicity.
Root Cause: The
doDropAccountfunction always creates its own transaction (begin;+finishTxn), even when called from within an existing transaction. WhenrestoreToClustercallsdropExistsAccount->doDropAccountto drop accounts, this internal transaction breaks the outer transaction started bydoRestoreSnapshot, causing subsequent operations to run in autocommit mode.Solution: Added an optional
inTransactionparameter todoDropAccount. WheninTransaction=true, the function skips creating a new transaction and uses the existing one. UpdateddropExistsAccountto passinTransaction=trueduring restore operations.Changes:
authenticate.go: AddedinTransaction ...boolparameter todoDropAccount, conditionally create transactionsnapshot.go: PassinTransaction=truewhen callingdoDropAccountfromdropExistsAccountImpact: Restore operations now correctly execute within a single transaction. Direct
DROP ACCOUNTcommands remain unchanged (backward compatible).