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

*: add test for #1329 and add VIEW & EVENT in builtin filter #1331

Merged
merged 5 commits into from
Dec 17, 2020
Merged

*: add test for #1329 and add VIEW & EVENT in builtin filter #1331

merged 5 commits into from
Dec 17, 2020

Conversation

lance6716
Copy link
Collaborator

@lance6716 lance6716 commented Dec 10, 2020 •
edited
Loading

What problem does this PR solve?

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test

Code changes

Side effects

Related changes

  • Need to cherry-pick to the release branch

@lance6716 lance6716 mentioned this pull request Dec 10, 2020
Open
@lance6716 lance6716 added priority/normal Minor change, requires approval from ≥1 primary reviewer type/bug-fix Bug fix labels Dec 10, 2020
@lance6716 lance6716 added this to the v2.0.1 milestone Dec 10, 2020
@lance6716
Copy link
Collaborator Author

lance6716 commented Dec 10, 2020 •
edited
Loading

top costing test cases in CI are

others: over 23m17
ha_cases: 9m47
shardddl3: 8m14
shardddl2: 7m41
many_tables: 6m4
shardddl1: 5m38

other cases are less than 3 minute. Will move some test case out of others

GMHDBJD
GMHDBJD reviewed Dec 11, 2020
View reviewed changes
tests/safe_mode/data/db1.increment.sql Outdated
Comment on lines 4 to 8
start transaction;
insert into t1 (uid, name, age) values (10005, 'Buenos Aires', 200);
insert into t2 (uid, name) values (20005, 'Aureliano José');
insert into t1 (uid, name, age) values (10006, 'Buenos Aires', 200);
commit;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Unfortunately, this case does not cover the wrong situation. The case can be passed even on the master branch before #1329 merged. The reason is source1 enable gtid, you can add the case for source2 or disable gtid for source1.

@lance6716 lance6716 mentioned this pull request Dec 11, 2020
Merged
@lance6716
Copy link
Collaborator Author 

[2020-12-14T02:38:06.863Z]             "msg": "[code=38032:class=dm-master:scope=internal:level=high], Message: some error occurs in dm-worker: ErrCode:36008 ErrClass:\"sync-unit\" ErrScope:\"internal\" ErrLevel:\"high\" Message:\"startLocation: [position: (test-7588bb6b-65b1-4a62-980d-3412a26e77d7-j8xbn-66jzg-bin.000001, 8635), gtid-set: 30bd0a18-3db5-11eb-9962-626e74d9f649:1-29], endLocation: [position: (test-7588bb6b-65b1-4a62-980d-3412a26e77d7-j8xbn-66jzg-bin.000001, 8763), gtid-set: 30bd0a18-3db5-11eb-9962-626e74d9f649:1-30]: detect inconsistent DDL sequence from source [first-location: position: (test-7588bb6b-65b1-4a62-980d-3412a26e77d7-j8xbn-66jzg-bin.000001, 8442), gtid-set: 30bd0a18-3db5-11eb-9962-626e74d9f649:1-28 ddls: [ALTER TABLE `sharding_target2`.`t_target` ADD COLUMN `new_col1` INT] source: `sharding_seq`.`t2` first-location: position: (test-7588bb6b-65b1-4a62-980d-3412a26e77d7-j8xbn-66jzg-bin.000001, 8635), gtid-set: 30bd0a18-3db5-11eb-9962-626e74d9f649:1-29 ddls: [ALTER TABLE `sharding_target2`.`t_target` ADD COLUMN `new_col3` INT] source: `sharding_seq`.`t2`], right DDL sequence should be [first-location: position: (test-7588bb6b-65b1-4a62-980d-3412a26e77d7-j8xbn-66jzg-bin.000001, 8056), gtid-set: 30bd0a18-3db5-11eb-9962-626e74d9f649:1-26 ddls: [ALTER TABLE `sharding_target2`.`t_target` ADD COLUMN `new_col1` INT] source: `sharding_seq`.`t1` first-location: position: (test-7588bb6b-65b1-4a62-980d-3412a26e77d7-j8xbn-66jzg-bin.000001, 8249), gtid-set: 30bd0a18-3db5-11eb-9962-626e74d9f649:1-27 ddls: [ALTER TABLE `sharding_target2`.`t_target` ADD COLUMN `new_col2` INT] source: `sharding_seq`.`t1` first-location: position: (test-7588bb6b-65b1-4a62-980d-3412a26e77d7-j8xbn-66jzg-bin.000001, 8635), gtid-set: 30bd0a18-3db5-11eb-9962-626e74d9f649:1-29 ddls: [ALTER TABLE `sharding_target2`.`t_target` ADD COLUMN `new_col3` INT] source: `sharding_seq`.`t2`]\" Workaround:\"Please use `show-ddl-locks` command for more details.\" , Workaround: Please execute `query-status` to check status.",

🤔

@lance6716 lance6716 changed the title *: add test for #1329 and revert VIEW support for #1105 *: add test for #1329 and add VIEW & EVENT in builtin filter Dec 16, 2020
@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 Dec 17, 2020
csuzhangxc
csuzhangxc reviewed Dec 17, 2020
View reviewed changes
Copy link
Member

@csuzhangxc csuzhangxc left a comment

Choose a reason for hiding this comment

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

LGTM

@csuzhangxc csuzhangxc added the status/LGT1 One reviewer already commented LGTM label Dec 17, 2020
lichunzhu
lichunzhu approved these changes Dec 17, 2020
View reviewed changes
Copy link
Contributor

@lichunzhu lichunzhu left a comment

Choose a reason for hiding this comment

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

LGTM

@lichunzhu lichunzhu added status/LGT2 Two reviewers already commented LGTM, ready for merge and removed status/LGT1 One reviewer already commented LGTM labels Dec 17, 2020
@lance6716 lance6716 merged commit ccda132 into pingcap:master Dec 17, 2020
@lance6716 lance6716 added the needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated label Dec 17, 2020
ti-srebot pushed a commit to ti-srebot/dm that referenced this pull request Dec 17, 2020
@lance6716 @ti-srebot
cherry pick pingcap#1331 to release-2.0
172e9d8 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Dec 17, 2020
Merged
@ti-srebot
Copy link

cherry pick to release-2.0 in PR #1343

@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 Dec 17, 2020
GMHDBJD pushed a commit that referenced this pull request Dec 17, 2020
@ti-srebot
cherry pick #1331 to release-2.0 (#1343)
22466f2
@lance6716 lance6716 mentioned this pull request Dec 17, 2020
Merged
@lance6716 lance6716 added the already-cherry-pick-1.0 The related PR is already cherry-picked to release-1.0. Add this label once the PR is cherry-picked label Dec 17, 2020
@lance6716 lance6716 mentioned this pull request Dec 18, 2020
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@csuzhangxc csuzhangxc csuzhangxc left review comments

@GMHDBJD GMHDBJD GMHDBJD left review comments

@lichunzhu lichunzhu lichunzhu approved these changes

Assignees
No one assigned
Labels
already-cherry-pick-1.0 The related PR is already cherry-picked to release-1.0. Add this label once the PR is cherry-picked 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 needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated priority/normal Minor change, requires approval from ≥1 primary reviewer status/LGT2 Two reviewers already commented LGTM, ready for merge type/bug-fix Bug fix
Projects
None yet
Milestone
v2.0.1
Development

Successfully merging this pull request may close these issues.

EVENT Object is not supported in TiDB，should have a default filter rule
5 participants
@lance6716 @ti-srebot @csuzhangxc @lichunzhu @GMHDBJD