Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ddl: fix admin repair table will reload fail on the other node #18285

Merged
merged 8 commits into from
Jul 2, 2020
Merged

ddl: fix admin repair table will reload fail on the other node #18285

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
315db9a
fix admin repair table reload problem
AilinKid Jun 30, 2020
69b7bcd
Merge branch 'master' into fix_repair_table_reload
AilinKid Jun 30, 2020
680759a
Merge branch 'master' into fix_repair_table_reload
AilinKid Jul 1, 2020
e2138eb
Merge branch 'master' into fix_repair_table_reload
AilinKid Jul 1, 2020
29cf6e6
Merge branch 'master' into fix_repair_table_reload
AilinKid Jul 1, 2020
b5b014e
add comments
AilinKid Jul 2, 2020
379df7e
Merge branch 'master' into fix_repair_table_reload
AilinKid Jul 2, 2020
02bd5e0
address comment
AilinKid Jul 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions infoschema/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func (b *Builder) ApplyDiff(m *meta.Meta, diff *model.SchemaDiff) ([]int64, erro
}
var oldTableID, newTableID int64
switch diff.Type {
case model.ActionCreateTable, model.ActionCreateSequence, model.ActionRecoverTable, model.ActionRepairTable:
case model.ActionCreateTable, model.ActionCreateSequence, model.ActionRecoverTable:
newTableID = diff.TableID
case model.ActionDropTable, model.ActionDropView, model.ActionDropSequence:
oldTableID = diff.TableID
Expand All @@ -75,7 +75,12 @@ func (b *Builder) ApplyDiff(m *meta.Meta, diff *model.SchemaDiff) ([]int64, erro
var allocs autoid.Allocators
if tableIDIsValid(oldTableID) {
if oldTableID == newTableID && diff.Type != model.ActionRenameTable &&
diff.Type != model.ActionExchangeTablePartition {
diff.Type != model.ActionExchangeTablePartition &&
// For repairing table in TiDB cluster, given 2 normal node and 1 repair node.
// For normal node's information schema, repaired table is existed.
// For repair node's information schema, repaired table is filtered (couldn't find it in `is`).
// So here skip to reserve the allocators when repairing table.
diff.Type != model.ActionRepairTable {
oldAllocs, _ := b.is.AllocByID(oldTableID)
allocs = filterAllocators(diff, oldAllocs)
}
Expand Down