-
Notifications
You must be signed in to change notification settings - Fork 5.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ddl: backport of (#38738) tidb_ddl_reorg commit conflicts #41115
Merged
Commits on Feb 6, 2023
-
ddl: avoid commit conflicts when updating/delete from mysql.tidb_ddl_…
…reorg. (pingcap#38738) * Added test case * ddl fix pingcap#38669. The issue was that mysql.tidb_ddl_reorg table was updated by an inner transaction after the outer transaction started, which then made a commit conflict in the outer transaction, when it deleted the same row. * Fixed typo in comment * Added test case for pingcap#24427 * Disabled tests for CI testing * Revert "Disabled tests for CI testing" This reverts commit 17c28f3. * Revert "Revert "Disabled tests for CI testing"" This reverts commit 65c84d9. * removed test skips * Clean up the tidb_ddl_reorg entry after DDL is completed * Use a cleanup job afterwards instead. * Fixed test * Moved cleanup before asyncNotify * More detailed test failure log * Refined test error message * Injecting timoeut to get stack traces from CI * Updated Debug Dump on timeout * Delete mulitple entries in tidb_ddl_reorg if needed * Linting * Linting * Added CI debug logs * Linting + CI debugs * fixed CI debug * Try to cleanup also if job.State == synced * check for non-error of runErr instead of error... * Use a new session, instead of reusing worker.sess * Also handle case when job == nil * Removed CI debug logs * Misssed change session from w.sess to newly created sess * Improved TestConcurrentDDLSwitch and added CI debug logs * Always cleaning up all orphan mysql.tidb_ddl_reorg entries * linting * Also cleanup if job is nil * Updated TestModifyColumnReorgInfo + CI debug logs * more CI debug * refactored the cleanupDDLReorgHandle code * Added missing cleanup in handleDDLJobQueue * Removed debug panic * Code cleanup * Test updates * Debug cleanup * Cleaned up test after removal of old non-concurrent DDL code merge * Linting * always wrap changes to tidb_ddl_reorg in an own transaction + fixed some typos * Minimum fix * Always update reorg meta, not only on error * Issue is here :) * Fixed newReorgHandler * Wrapped more tidb_ddl_reorg changes into separate transactions * linting * Removed updateDDLReorgStartHandle * cleanups * Made runInTxn a method on *session, instead of normal function * Update test * Final touches * Removed duplicate test * CleanupDDLReorgHandles should only be called from HandleJobDone. * Variable rename * Renamed 'delete' variabel name * Updated test * small revert * Removed timeout debugging code * Simplified the cleanup to only start a new txn and not a new session * Reverted the change of GetDDLInfo Co-authored-by: Ti Chi Robot <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 176b2be - Browse repository at this point
Copy the full SHA 176b2beView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8b07969 - Browse repository at this point
Copy the full SHA 8b07969View commit details
Commits on Feb 21, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 2ce98d3 - Browse repository at this point
Copy the full SHA 2ce98d3View commit details
Commits on Apr 10, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 76f02d8 - Browse repository at this point
Copy the full SHA 76f02d8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7662330 - Browse repository at this point
Copy the full SHA 7662330View commit details -
Configuration menu - View commit details
-
Copy full SHA for dc5dbaf - Browse repository at this point
Copy the full SHA dc5dbafView commit details
Commits on Apr 11, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 1fdd10e - Browse repository at this point
Copy the full SHA 1fdd10eView commit details -
Configuration menu - View commit details
-
Copy full SHA for d72e8b7 - Browse repository at this point
Copy the full SHA d72e8b7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 96f8a1f - Browse repository at this point
Copy the full SHA 96f8a1fView commit details
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.