Skip to content

session: make all DDLs reentrant in upgradeToVer212 (#56605) #56625

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

Merged
merged 2 commits into from
Oct 14, 2024
Merged

session: make all DDLs reentrant in upgradeToVer212 (#56605) #56625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa68d05
session: make all DDLs reentrant in upgradeToVer212
tangenta Oct 12, 2024
c3e4b86
fix TestTiDBUpgradeToVer212
tangenta Oct 12, 2024
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
4 changes: 2 additions & 2 deletions pkg/session/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3220,9 +3220,9 @@ func upgradeToVer212(s sessiontypes.Session, ver int64) {
// add column `repeats`.
doReentrantDDL(s, "ALTER TABLE mysql.tidb_runaway_queries ADD COLUMN `repeats` int DEFAULT 1 AFTER `time`;", infoschema.ErrColumnExists)
// rename column name from `time` to `start_time`, will auto rebuild the index.
doReentrantDDL(s, "ALTER TABLE mysql.tidb_runaway_queries RENAME COLUMN `time` TO `start_time`")
doReentrantDDL(s, "ALTER TABLE mysql.tidb_runaway_queries RENAME COLUMN `time` TO `start_time`", infoschema.ErrColumnNotExists)
// rename column `original_sql` to `sample_sql`.
doReentrantDDL(s, "ALTER TABLE mysql.tidb_runaway_queries RENAME COLUMN `original_sql` TO `sample_sql`")
doReentrantDDL(s, "ALTER TABLE mysql.tidb_runaway_queries RENAME COLUMN `original_sql` TO `sample_sql`", infoschema.ErrColumnNotExists)
// modify column type of `plan_digest`.
doReentrantDDL(s, "ALTER TABLE mysql.tidb_runaway_queries MODIFY COLUMN `plan_digest` varchar(64) DEFAULT '';", infoschema.ErrColumnExists)
// 3. modify column length of `action`.
Expand Down
8 changes: 0 additions & 8 deletions pkg/session/bootstrap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,12 +270,6 @@ func revertVersionAndVariables(t *testing.T, se sessiontypes.Session, ver int) {
// for version <= version195, tidb_enable_dist_task should be disabled before upgrade
MustExec(t, se, "update mysql.global_variables set variable_value='off' where variable_name='tidb_enable_dist_task'")
}
if ver < version212 && ver >= version172 {
// for version < version212, revert column changes related to function `upgradeToVer212`.
// related tables created after version172.
MustExec(t, se, "ALTER TABLE mysql.tidb_runaway_queries RENAME COLUMN `start_time` TO `time`")
MustExec(t, se, "ALTER TABLE mysql.tidb_runaway_queries RENAME COLUMN `sample_sql` TO `original_sql`")
}
}

// TestUpgrade tests upgrading
Expand Down Expand Up @@ -2433,8 +2427,6 @@ func TestTiDBUpgradeToVer212(t *testing.T) {
err = m.FinishBootstrap(int64(ver198))
require.NoError(t, err)
revertVersionAndVariables(t, seV198, ver198)
// simulate a real ver198 where mysql.tidb_runaway_queries` doesn't have `start_time`/`sample_sql` columns yet.
MustExec(t, seV198, "select original_sql, time from mysql.tidb_runaway_queries")
err = txn.Commit(context.Background())
require.NoError(t, err)
unsetStoreBootstrapped(store.UUID())
Expand Down