This repository has been archived by the owner on Nov 24, 2023. It is now read-only.
optimist: only update table info if no conflict #1496
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
status/PTAL
|
/lgtm |
|
/lgtm |
ti-srebot
previously approved these changes
Mar 11, 2021
ti-srebot
added
the
status/LGT2
|
/merge |
lichunzhu
reviewed
Mar 11, 2021
pkg/shardddl/optimism/lock.go
Outdated
| @@ -180,8 +185,9 @@ func (l *Lock) TrySync(callerSource, callerSchema, callerTable string, | |||
| nextTable = schemacmp.Encode(newTI) | |||
| // special case: check whether DDLs making the schema become part of larger and another part of smaller. | |||
| if _, err = prevTable.Compare(nextTable); err != nil { | |||
| return emptyDDLs, terror.ErrShardDDLOptimismTrySyncFail.Delegate( | |||
| err = terror.ErrShardDDLOptimismTrySyncFail.Delegate( | |||
There was a problem hiding this comment.
Do we need this? err is a returned variable in L95.
There was a problem hiding this comment.
address in dfab765
|
|
|
/run-all-tests |
lance6716
approved these changes
Mar 11, 2021
ti-srebot
pushed a commit
to ti-srebot/dm
that referenced
this pull request
Mar 11, 2021
Signed-off-by: ti-srebot <[email protected]>
|
cherry pick to release-2.0 in PR #1502 |
ti-srebot
added
already-cherry-pick-2.0
lance6716
pushed a commit
that referenced
this pull request
Mar 11, 2021
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?
close #1484
What is changed and how it works?
If a ddl conflict with previous one, do not update table info in master, so we can use handle-error replace to replace a new ddl and no conflict.
Check List
Tests