Skip to content
This repository has been archived by the owner on Nov 24, 2023. It is now read-only.

test: fix unstabled drop then add column #1548

Merged
merged 2 commits into from
Mar 30, 2021

Conversation

lance6716
Copy link
Collaborator

What problem does this PR solve?

fix #1540 (comment)

What is changed and how it works?

move add column after a sync-diff check

Check List

Tests

  • No code

Code changes

Side effects

Related changes

  • Need to cherry-pick to the release branch

@lance6716 lance6716 added the needs-cherry-pick-release-2.0 This PR should be cherry-picked to release-2.0. Remove this label after cherry-picked to release-2.0 label Mar 30, 2021
@lance6716
Copy link
Collaborator Author

@lichunzhu
Copy link
Contributor

/hold

@lance6716

This comment has been minimized.

@lance6716
Copy link
Collaborator Author

lance6716 commented Mar 30, 2021

there's no mysql-replica-02

between

[2021/03/30 12:03:15.429 +08:00] [INFO] [lock.go:525] ["table added to the lock"] [lock=test-`shardddl`.`tb`] [source=mysql-replica-02] [schema=shardddl1] [table=tb1] ["table info"="CREATE TABLE `tbl`(`a` INT(11) NOT NULL, `b` INT(11), PRIMARY KEY (`a`)) CHARSET UTF8MB4 COLLATE UTF8MB4_0900_AI_CI"]

(DM master restart)

and

[2021/03/30 12:03:21.025 +08:00] [INFO] [lock.go:525] ["table added to the lock"] [lock=test-`shardddl`.`tb`] [source=mysql-replica-02] [schema=shardddl1] [table=tb1] ["table info"="CREATE TABLE `tbl`(`a` INT(11) NOT NULL, PRIMARY KEY (`a`)) CHARSET UTF8MB4 COLLATE UTF8MB4_0900_AI_CI"]

🤔 https://internal.pingcap.net/idc-jenkins/blue/organizations/jenkins/dm_ghpr_test/detail/dm_ghpr_test/8648/pipeline/89

@lance6716
Copy link
Collaborator Author

/unhold

@lichunzhu
Copy link
Contributor

/lgtm

@ti-chi-bot ti-chi-bot added the status/LGT1 One reviewer already commented LGTM label Mar 30, 2021
Copy link
Collaborator

@GMHDBJD GMHDBJD left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rest LGTM

Comment on lines +1086 to +1088
"run_sql_source1 \"create table ${shardddl1}.${tb1} (a int primary key, b int, c int);\"; \
run_sql_source2 \"create table ${shardddl1}.${tb1} (a int primary key, b int, c int);\"" \
"clean_table" "optimistic" "$i"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"run_sql_source1 \"create table ${shardddl1}.${tb1} (a int primary key, b int, c int);\"; \
run_sql_source2 \"create table ${shardddl1}.${tb1} (a int primary key, b int, c int);\"" \
"clean_table" "optimistic" "$i"
"run_sql_source1 \"create table ${shardddl1}.${tb1} (a int primary key, b int, c int);\"; \
run_sql_source2 \"create table ${shardddl1}.${tb1} (a int primary key, b int, c int);\"" \
"clean_table" "optimistic" "$i"

Copy link
Collaborator

@GMHDBJD GMHDBJD left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • GMHDBJD
  • lichunzhu

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added status/LGT2 Two reviewers already commented LGTM, ready for merge and removed status/LGT1 One reviewer already commented LGTM labels Mar 30, 2021
@lance6716
Copy link
Collaborator Author

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 5c8f022

@ti-chi-bot ti-chi-bot merged commit 8cd3e8a into pingcap:master Mar 30, 2021
ti-srebot pushed a commit to ti-srebot/dm that referenced this pull request Mar 30, 2021
@ti-srebot
Copy link

cherry pick to release-2.0 in PR #1549

@ti-srebot ti-srebot added already-cherry-pick-2.0 The related PR is already cherry-picked to release-2.0. Add this label once the PR is cherry-picked and removed needs-cherry-pick-release-2.0 This PR should be cherry-picked to release-2.0. Remove this label after cherry-picked to release-2.0 labels Mar 30, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
already-cherry-pick-2.0 The related PR is already cherry-picked to release-2.0. Add this label once the PR is cherry-picked size/M status/can-merge status/LGT2 Two reviewers already commented LGTM, ready for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants