ddl: delete ranges when rolling back 'add index' #6188
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
|
/run-all-tests |
coocood
reviewed
Mar 31, 2018
ddl/ddl_db_test.go
Outdated
| @@ -323,6 +323,7 @@ func (s *testDBSuite) TestCancelAddIndex(c *C) { | |||
| } | |||
|
|
|||
| var checkErr error | |||
| var idxInfo *model.IndexInfo | |||
ddl/ddl_worker.go
Outdated
| break | ||
| } | ||
| // ActionAddIndex needs to delete ranges when it needs to be rolled back. | ||
| fallthrough |
There was a problem hiding this comment.
fallthrough is rarely used, it's hard to read.
How about extracting a function shouldDeleteRange?
ddl/index.go
Outdated
| @@ -395,6 +395,7 @@ func (d *ddl) onDropIndex(t *meta.Meta, job *model.Job) (ver int64, _ error) { | |||
| job.FinishTableJob(model.JobStateDone, model.StateNone, ver, tblInfo) | |||
| } | |||
| job.Args = append(job.Args, indexInfo.ID) | |||
| log.Warnf("args %v, ts %v", job.Args, t.StartTS) | |||
|
PTAL @coocood |
shenli
reviewed
Apr 2, 2018
ddl/ddl_worker.go
Outdated
| } | ||
| // ActionAddIndex needs to delete ranges when it needs to be rolled back. |
There was a problem hiding this comment.
After rolling back an AddIndex operation, we need to use delete-range to delete the half-done index data.
|
PTAL @shenli |
|
LGTM |
zz-jason
added
status/LGT2
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We need to delete ranges when the operation of 'add index' needs to be rolled back.