Skip to content

Commit 6ec98ab

Browse files
committed
upgrades: fix order of AddHotRangeLoggerJob migration
The V25_3_AddHotRangeLoggerJob cluster version comes _after_ the V25_3_AddEstimatedLastLoginTime version. Yet, the corresponding upgrade for adding the hot ranges logger was incorrectly being done _before_ the last login time column. Release note: None
1 parent 8b5e34a commit 6ec98ab

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

pkg/upgrade/upgrades/upgrades.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,6 @@ var upgrades = []upgradebase.Upgrade{
9696
eventLogTableMigration,
9797
upgrade.RestoreActionNotRequired("cluster restore does not restore the new column or index"),
9898
),
99-
upgrade.NewTenantUpgrade(
100-
"add new hot range logger job",
101-
clusterversion.V25_3_AddHotRangeLoggerJob.Version(),
102-
upgrade.NoPrecondition,
103-
addHotRangeLoggerJob,
104-
upgrade.RestoreActionNotRequired("cluster restore does not restore this job"),
105-
),
10699

107100
upgrade.NewTenantUpgrade(
108101
"add 'estimated_last_login_time' column to system.users table",
@@ -112,6 +105,14 @@ var upgrades = []upgradebase.Upgrade{
112105
upgrade.RestoreActionNotRequired("cluster restore does not restore the new column"),
113106
),
114107

108+
upgrade.NewTenantUpgrade(
109+
"add new hot range logger job",
110+
clusterversion.V25_3_AddHotRangeLoggerJob.Version(),
111+
upgrade.NoPrecondition,
112+
addHotRangeLoggerJob,
113+
upgrade.RestoreActionNotRequired("cluster restore does not restore this job"),
114+
),
115+
115116
// Note: when starting a new release version, the first upgrade (for
116117
// Vxy_zStart) must be a newFirstUpgrade. Keep this comment at the bottom.
117118
}

0 commit comments

Comments
 (0)