This repository has been archived by the owner on Nov 24, 2023. It is now read-only.
*: rollback schema in the tracker; fix save table checkpoint in optimistic mode #625
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
…ot supported now)
|
/run-all-tests |
csuzhangxc
commented
Apr 23, 2020
| @@ -438,6 +438,13 @@ func (p *Pessimist) handleInfoPut(ctx context.Context, infoCh <-chan pessimism.I | |||
| lockID, synced, remain, err := p.lk.TrySync(info, p.taskSources(info.Task)) | |||
| if err != nil { | |||
| // TODO: add & update metrics. | |||
| // FIXME: the following case is not supported automatically now, try to support it later. | |||
| "\"result\": true" 3 | ||
|
|
||
| # NOTE: the lock may be locked for the next DDL, for details please see the following comments in `master/shardll/pessimist.go`, | ||
| # `FIXME: the following case is not supported automatically now, try to support it later` |
| if point.rollback() { | ||
| logger.Debug("try to rollback checkpoint", log.WrapStringerField("checkpoint", point)) | ||
| from := point.MySQLLocation() | ||
| if point.rollback(schemaTracker, schema) { |
csuzhangxc
added
priority/normal
csuzhangxc
commented
Apr 23, 2020
| b.Lock() | ||
| defer b.Unlock() | ||
| b.location = b.flushedLocation | ||
| if isSchemaChanged = b.ti != b.flushedTI; isSchemaChanged { | ||
| b.location = b.flushedLocation.Clone() |
|
/run-all-tests |
Codecov Report
@@ Coverage Diff @@
## master #625 +/- ##
================================================
+ Coverage 57.7114% 57.7381% +0.0266%
================================================
Files 202 202
Lines 20502 20496 -6
================================================
+ Hits 11832 11834 +2
+ Misses 7523 7516 -7
+ Partials 1147 1146 -1 |
|
@WangXiangUSTC @lichunzhu PTAL |
lichunzhu
added
status/PTAL
csuzhangxc
commented
Apr 24, 2020
| s.tctx.L().Info("save table checkpoint", zap.String("event", "query"), | ||
| zap.String("schema", upSchema), zap.String("table", upTable), | ||
| zap.Strings("ddls", needHandleDDLs), log.WrapStringerField("location", ec.currentLocation)) | ||
| s.saveTablePoint(upSchema, upTable, ec.currentLocation.Clone()) |
There was a problem hiding this comment.
found a bug relative to #584.
csuzhangxc
changed the title
lichunzhu
reviewed
Apr 27, 2020
|
|
||
| log.L().Info("set FlushCheckpointStage", zap.String("failpoint", "FlushCheckpointStage"), zap.Int("stage", testInjector.flushCheckpointStage)) | ||
| if testInjector.flushCheckpointStage == maxStage { | ||
| testInjector.flushCheckpointStage = -1 // disable for following stages. |
There was a problem hiding this comment.
After set flushCheckpointStage to -1, will flushCheckpointStage increase to maxStage later?
There was a problem hiding this comment.
No, So how about setting it to MaxInt?
There was a problem hiding this comment.
I understand it. I think -1 is just OK.
lichunzhu
added
status/LGT1
syncer/checkpoint.go
Outdated
| // if any of them are not equal, then we rollback them: | ||
| // - set the one in the checkpoint but not flushed to the one flushed. | ||
| // - set the one tracked to the one in the checkpoint by the caller of this method (both flushed and not flushed are the same now) | ||
| if isSchemaChanged = trackedTi != b.ti || b.ti != b.flushedTI; isSchemaChanged { |
There was a problem hiding this comment.
how about adding some ()
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?
fix #585.
What is changed and how it works?
rollback tracked schema when pausing/stopping.
Check List
Tests
Code changes
Side effects