This repository has been archived by the owner on Nov 24, 2023. It is now read-only.
shardddl: fix resume conflict ddl. #722
Merged
Conversation
This file contains 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
GMHDBJD
added
priority/normal
Codecov Report
@@ Coverage Diff @@
## master #722 +/- ##
================================================
- Coverage 57.0981% 57.0248% -0.0734%
================================================
Files 205 205
Lines 21104 21189 +85
================================================
+ Hits 12050 12083 +33
- Misses 7890 7931 +41
- Partials 1164 1175 +11 |
csuzhangxc
reviewed
Jun 8, 2020
syncer/sharding-meta/shardmeta.go
Outdated
| @@ -178,25 +178,23 @@ func (meta *ShardingMeta) checkItemExists(item *DDLItem) (int, bool) { | |||
| // active: whether the DDL will be processed in this round | |||
| func (meta *ShardingMeta) AddItem(item *DDLItem) (active bool, err error) { | |||
| index, exists := meta.checkItemExists(item) | |||
| if exists { | |||
| return index == meta.activeIdx, nil | |||
There was a problem hiding this comment.
Is it easy to add a negative test case for #719?
one more question, can we reset shard meta when resuming?
GMHDBJD
added
the
needs-cherry-pick-release-1.0
|
/run-all-tests |
| "\"result\": true" 3 | ||
|
|
||
| cp $cur/conf/dm-task.yaml $WORK_DIR/task.yaml | ||
| echo "ignore-checking-items: [\"all\"]" >> $WORK_DIR/task.yaml |
There was a problem hiding this comment.
why need to ignore all checks? how about adding a comment
There was a problem hiding this comment.
add comment in 644a504
We have a discuss in #582 (comment) . |
csuzhangxc
added
status/LGT1
WangXiangUSTC
added
status/LGT2
|
cherry pick to release-1.0 failed |
|
@GMHDBJD please cherry-pick it manually again. 😢 |
GMHDBJD
added a commit
to GMHDBJD/dm
that referenced
this pull request
Jun 15, 2020
csuzhangxc
added
already-cherry-pick-1.0
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 problem does this PR solve?
#719 #582
What is changed and how it works?
ErrSyncerShardDDLConflictas UnresumableErrorTests
Related changes