Skip to content
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.

Sign up for GitHub

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

Jump to bottom

ddl: avoid commit conflicts when updating/delete from mysql.tidb_ddl_reorg. #38738

Merged
merged 76 commits into from
Jan 11, 2023
Merged

ddl: avoid commit conflicts when updating/delete from mysql.tidb_ddl_reorg. #38738

merged 76 commits into from
Jan 11, 2023

Commits on Oct 27, 2022

  1. Added test case

    @mjonss
    mjonss committed Oct 27, 2022
    Configuration menu
    Copy the full SHA
    e2e3b5c View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2022

  1. 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.
    @mjonss
    mjonss committed Oct 29, 2022
    Configuration menu
    Copy the full SHA
    eb69cab View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2022

  1. Fixed typo in comment

    @mjonss
    mjonss committed Oct 30, 2022
    Configuration menu
    Copy the full SHA
    841b5fa View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2022

  1. Added test case for pingcap#24427

    @mjonss
    mjonss committed Nov 9, 2022
    Configuration menu
    Copy the full SHA
    51174b0 View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2022

  1. Merge remote-tracking branch 'pingcap/master' into trunc-warn-38669

    @mjonss
    mjonss committed Dec 25, 2022
    Configuration menu
    Copy the full SHA
    cbd0981 View commit details
    Browse the repository at this point in the history

  2. Disabled tests for CI testing

    @mjonss
    mjonss committed Dec 25, 2022
    Configuration menu
    Copy the full SHA
    17c28f3 View commit details
    Browse the repository at this point in the history

  3. Revert "Disabled tests for CI testing" 

    This reverts commit 17c28f3.
    @mjonss
    mjonss committed Dec 25, 2022
    Configuration menu
    Copy the full SHA
    65c84d9 View commit details
    Browse the repository at this point in the history

  4. Revert "Revert "Disabled tests for CI testing"" 

    This reverts commit 65c84d9.
    @mjonss
    mjonss committed Dec 25, 2022
    Configuration menu
    Copy the full SHA
    f432276 View commit details
    Browse the repository at this point in the history

  5. removed test skips

    @mjonss
    mjonss committed Dec 25, 2022
    Configuration menu
    Copy the full SHA
    31a8165 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2022

  1. Clean up the tidb_ddl_reorg entry after DDL is completed

    @mjonss
    mjonss committed Dec 26, 2022
    Configuration menu
    Copy the full SHA
    93ec6ce View commit details
    Browse the repository at this point in the history

  2. Use a cleanup job afterwards instead.

    @mjonss
    mjonss committed Dec 26, 2022
    Configuration menu
    Copy the full SHA
    f392e91 View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2022

  1. Fixed test

    @mjonss
    mjonss committed Dec 27, 2022
    Configuration menu
    Copy the full SHA
    270a640 View commit details
    Browse the repository at this point in the history

  2. Moved cleanup before asyncNotify

    @mjonss
    mjonss committed Dec 27, 2022
    Configuration menu
    Copy the full SHA
    c56449d View commit details
    Browse the repository at this point in the history

  3. More detailed test failure log

    @mjonss
    mjonss committed Dec 27, 2022
    Configuration menu
    Copy the full SHA
    f8b2d62 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into trunc-warn-38669

    @mjonss
    mjonss committed Dec 27, 2022
    Configuration menu
    Copy the full SHA
    4de5504 View commit details
    Browse the repository at this point in the history

  5. Refined test error message

    @mjonss
    mjonss committed Dec 27, 2022
    Configuration menu
    Copy the full SHA
    2015061 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2022

  1. Merge branch 'master' into trunc-warn-38669

    @mjonss
    mjonss committed Dec 28, 2022
    Configuration menu
    Copy the full SHA
    d673abc View commit details
    Browse the repository at this point in the history

  2. Injecting timoeut to get stack traces from CI

    @mjonss
    mjonss committed Dec 28, 2022
    Configuration menu
    Copy the full SHA
    f9ed823 View commit details
    Browse the repository at this point in the history

  3. Updated Debug Dump on timeout

    @mjonss
    mjonss committed Dec 28, 2022
    Configuration menu
    Copy the full SHA
    9672513 View commit details
    Browse the repository at this point in the history

  4. Delete mulitple entries in tidb_ddl_reorg if needed

    @mjonss
    mjonss committed Dec 28, 2022
    Configuration menu
    Copy the full SHA
    4f667f9 View commit details
    Browse the repository at this point in the history

  5. Linting

    @mjonss
    mjonss committed Dec 28, 2022
    Configuration menu
    Copy the full SHA
    7908ee8 View commit details
    Browse the repository at this point in the history

  6. Linting

    @mjonss
    mjonss committed Dec 28, 2022
    Configuration menu
    Copy the full SHA
    88a891e View commit details
    Browse the repository at this point in the history

  7. Added CI debug logs

    @mjonss
    mjonss committed Dec 28, 2022
    Configuration menu
    Copy the full SHA
    9f9a4ca View commit details
    Browse the repository at this point in the history

  8. Linting + CI debugs

    @mjonss
    mjonss committed Dec 28, 2022
    Configuration menu
    Copy the full SHA
    b7fda44 View commit details
    Browse the repository at this point in the history

  9. fixed CI debug

    @mjonss
    mjonss committed Dec 28, 2022
    Configuration menu
    Copy the full SHA
    64f2925 View commit details
    Browse the repository at this point in the history

  10. Try to cleanup also if job.State == synced

    @mjonss
    mjonss committed Dec 28, 2022
    Configuration menu
    Copy the full SHA
    a713d57 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2022

  1. check for non-error of runErr instead of error...

    @mjonss
    mjonss committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    d968d4e View commit details
    Browse the repository at this point in the history

  2. Use a new session, instead of reusing worker.sess

    @mjonss
    mjonss committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    6a0e0c3 View commit details
    Browse the repository at this point in the history

  3. Also handle case when job == nil

    @mjonss
    mjonss committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    e13c332 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'pingcap/master' into trunc-warn-38669

    @mjonss
    mjonss committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    fe65fa9 View commit details
    Browse the repository at this point in the history

  5. Removed CI debug logs

    @mjonss
    mjonss committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    5614b30 View commit details
    Browse the repository at this point in the history

  6. Misssed change session from w.sess to newly created sess

    @mjonss
    mjonss committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    ab0087a View commit details
    Browse the repository at this point in the history

  7. Improved TestConcurrentDDLSwitch and added CI debug logs

    @mjonss
    mjonss committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    6186476 View commit details
    Browse the repository at this point in the history

  8. Always cleaning up all orphan mysql.tidb_ddl_reorg entries

    @mjonss
    mjonss committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    7257bd0 View commit details
    Browse the repository at this point in the history

  9. linting

    @mjonss
    mjonss committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    6eb65d3 View commit details
    Browse the repository at this point in the history

  10. Also cleanup if job is nil

    @mjonss
    mjonss committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    143f889 View commit details
    Browse the repository at this point in the history

  11. Merge remote-tracking branch 'pingcap/master' into trunc-warn-38669

    @mjonss
    mjonss committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    3f6dcc5 View commit details
    Browse the repository at this point in the history

  12. Updated TestModifyColumnReorgInfo + CI debug logs

    @mjonss
    mjonss committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    5473f2f View commit details
    Browse the repository at this point in the history

  13. more CI debug

    @mjonss
    mjonss committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    250717d View commit details
    Browse the repository at this point in the history

  14. refactored the cleanupDDLReorgHandle code

    @mjonss
    mjonss committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    641f89b View commit details
    Browse the repository at this point in the history

  15. Added missing cleanup in handleDDLJobQueue

    @mjonss
    mjonss committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    eda7cc9 View commit details
    Browse the repository at this point in the history

  16. Removed debug panic

    @mjonss
    mjonss committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    0598ed7 View commit details
    Browse the repository at this point in the history

  17. Code cleanup

    @mjonss
    mjonss committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    13c3d56 View commit details
    Browse the repository at this point in the history

  18. Test updates

    @mjonss
    mjonss committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    54e0b24 View commit details
    Browse the repository at this point in the history

  19. Debug cleanup

    @mjonss
    mjonss committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    1d55510 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2022

  1. Merge remote-tracking branch 'pingcap/master' into trunc-warn-38669

    @mjonss
    mjonss committed Dec 30, 2022
    Configuration menu
    Copy the full SHA
    cf478ea View commit details
    Browse the repository at this point in the history

  2. Cleaned up test after removal of old non-concurrent DDL code merge

    @mjonss
    mjonss committed Dec 30, 2022
    Configuration menu
    Copy the full SHA
    ee44b65 View commit details
    Browse the repository at this point in the history

  3. Linting

    @mjonss
    mjonss committed Dec 30, 2022
    Configuration menu
    Copy the full SHA
    0ed2f47 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2023

  1. always wrap changes to tidb_ddl_reorg in an own transaction 

    + fixed some typos
    @mjonss
    mjonss committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    8cee684 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'pingcap/master' into trunc-warn-38669

    @mjonss
    mjonss committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    0164c1a View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2023

  1. Minimum fix

    @mjonss
    mjonss committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    d8483ab View commit details
    Browse the repository at this point in the history

  2. Always update reorg meta, not only on error

    @mjonss
    mjonss committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    d05b1af View commit details
    Browse the repository at this point in the history

  3. Issue is here :)

    @mjonss
    mjonss committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    10cddb7 View commit details
    Browse the repository at this point in the history

  4. Fixed newReorgHandler

    @mjonss
    mjonss committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    751a54a View commit details
    Browse the repository at this point in the history

  5. Wrapped more tidb_ddl_reorg changes into separate transactions

    @mjonss
    mjonss committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    83894b3 View commit details
    Browse the repository at this point in the history

  6. linting

    @mjonss
    mjonss committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    d0340d8 View commit details
    Browse the repository at this point in the history

  7. Removed updateDDLReorgStartHandle

    @mjonss
    mjonss committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    7f18011 View commit details
    Browse the repository at this point in the history

  8. cleanups

    @mjonss
    mjonss committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    0db4bb3 View commit details
    Browse the repository at this point in the history

  9. Made runInTxn a method on *session, instead of normal function

    @mjonss
    mjonss committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    5153f09 View commit details
    Browse the repository at this point in the history

  10. Update test

    @mjonss
    mjonss committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    86bc31a View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2023

  1. Final touches

    @mjonss
    mjonss committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    445d84c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fix-tidb_ddl_reorg' into trunc-warn-38669

    @mjonss
    mjonss committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    79e52b9 View commit details
    Browse the repository at this point in the history

  3. Removed duplicate test

    @mjonss
    mjonss committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    b0b5084 View commit details
    Browse the repository at this point in the history

  4. CleanupDDLReorgHandles should only be called from HandleJobDone.

    @mjonss
    mjonss committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    c35d853 View commit details
    Browse the repository at this point in the history

  5. Variable rename

    @mjonss
    mjonss committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    f1543d5 View commit details
    Browse the repository at this point in the history

  6. Renamed 'delete' variabel name

    @mjonss
    mjonss committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    bfb5f52 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into trunc-warn-38669

    @mjonss
    mjonss committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    0ec2512 View commit details
    Browse the repository at this point in the history

  8. Updated test

    @mjonss
    mjonss committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    78281b3 View commit details
    Browse the repository at this point in the history

  9. small revert

    @mjonss
    mjonss committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    7214e31 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2023

  1. Merge remote-tracking branch 'pingcap/master' into trunc-warn-38669

    @mjonss
    mjonss committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    f9983e9 View commit details
    Browse the repository at this point in the history

  2. Removed timeout debugging code

    @mjonss
    mjonss committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    51bacd3 View commit details
    Browse the repository at this point in the history

  3. Simplified the cleanup to only start a new txn and not a new session

    @mjonss
    mjonss committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    389ad4d View commit details
    Browse the repository at this point in the history

  4. Reverted the change of GetDDLInfo

    @mjonss
    mjonss committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    f04df45 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into trunc-warn-38669

    @ti-chi-bot
    ti-chi-bot committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    076be10 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into trunc-warn-38669

    @ti-chi-bot
    ti-chi-bot committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    022d951 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into trunc-warn-38669

    @ti-chi-bot
    ti-chi-bot committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    43b6946 View commit details
    Browse the repository at this point in the history