This repository has been archived by the owner on Nov 24, 2023. It is now read-only.
operate-schema: flush schema info and sync to master in optimistic mode #1506
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/WIP
lance6716
reviewed
Mar 12, 2021
syncer/checkpoint.go
Outdated
| args = append(args, arg) | ||
|
|
||
| // use a new context apart from syncer, to make sure when syncer call `cancel` checkpoint could update | ||
| tctx2, cancel := tctx.WithContext(context.Background()).WithTimeout(maxDMLConnectionDuration) |
There was a problem hiding this comment.
I suddently realized if this action cost a long time, other checkpoint method maybe blocked. Hope it will not block upward to some user interface commands
There was a problem hiding this comment.
Since operate-schema can only use when task paused, the impact of other checkpoint method should be minimal. For user interface, maybe we can use smaller timeout arg?
Co-authored-by: lance6716 <lance6716@gmail.com>
lance6716
added
the
needs-update-docs
lance6716
reviewed
Mar 15, 2021
Co-authored-by: lance6716 <lance6716@gmail.com>
|
/lgtm |
lichunzhu
reviewed
Mar 17, 2021
dm/master/shardddl/optimist.go
Outdated
| @@ -499,7 +499,9 @@ func (o *Optimist) handleOperationPut(ctx context.Context, opCh <-chan optimism. | |||
| func (o *Optimist) handleLock(info optimism.Info, tts []optimism.TargetTable, skipDone bool) error { | |||
| lockID, newDDLs, err := o.lk.TrySync(info, tts) | |||
| var cfStage = optimism.ConflictNone | |||
| if err != nil { | |||
| if info.IgnoreConflict { | |||
| o.logger.Warn("handle lock in ignore conflict mode", zap.String("lock", lockID), zap.Stringer("info", info)) | |||
There was a problem hiding this comment.
Even if we are in ignore-conflict mode, I think it's better to log the error rather than omit it.
pkg/shardddl/optimism/lock_test.go
Outdated
Comment on lines
1660
to
1661
| info = NewInfo(task, source, db, tbls[0], downSchema, downTable, DDLs1, nil, []*model.TableInfo{ti1}) | ||
| info.Version = vers[source][db][tbls[0]] |
There was a problem hiding this comment.
You can add a function NewInfoWithVersion in this test.go since it's used so many times.
syncer/checkpoint.go
Outdated
| @@ -553,6 +557,43 @@ func (cp *RemoteCheckPoint) FlushPointsExcept(tctx *tcontext.Context, exceptTabl | |||
| return nil | |||
| } | |||
|
|
|||
| // FlushPointWithTableInfo implements CheckPoint.FlushPointWithTableInfo | |||
| func (cp *RemoteCheckPoint) FlushPointWithTableInfo(tctx *tcontext.Context, schema string, table string, ti *model.TableInfo) error { | |||
There was a problem hiding this comment.
Am I right?
Suggested change
| func (cp *RemoteCheckPoint) FlushPointWithTableInfo(tctx *tcontext.Context, schema string, table string, ti *model.TableInfo) error { | |
| func (cp *RemoteCheckPoint) FlushPointWithTableInfo(tctx *tcontext.Context, sourceSchema, sourceTable string, ti *model.TableInfo) error { |
Co-authored-by: Chunzhu Li <lichunzhu@stu.xjtu.edu.cn>
Co-authored-by: Chunzhu Li <lichunzhu@stu.xjtu.edu.cn>
lichunzhu
reviewed
Mar 17, 2021
Co-authored-by: Chunzhu Li <lichunzhu@stu.xjtu.edu.cn>
lichunzhu
approved these changes
Mar 18, 2021
ti-srebot
pushed a commit
to ti-srebot/dm
that referenced
this pull request
Mar 18, 2021
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
|
cherry pick to release-2.0 in PR #1514 |
ti-srebot
added
already-cherry-pick-2.0
lance6716
pushed a commit
that referenced
this pull request
Mar 19, 2021
7 tasks
7 tasks
lance6716
removed
the
needs-update-docs
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?
handle rename column statement
What is changed and how it works?
--flushand--syncforoperate-schema setCheck List
Tests
Code changes