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

release-23.1: upgrades: deflake TestMigrationWithFailures #100666

Merged
merged 1 commit into from
Apr 5, 2023
Merged

release-23.1: upgrades: deflake TestMigrationWithFailures #100666

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions pkg/upgrade/upgrades/schema_changes_external_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ type schemaChangeTestCase struct {
// exponential backoff to the system.jobs table, but was retrofitted to prevent
// regressions.
func TestMigrationWithFailures(t *testing.T) {
skip.WithIssue(t, 98564)
const createTableBefore = `
CREATE TABLE test.test_table (
id INT8 DEFAULT unique_rowid() PRIMARY KEY,
Expand Down Expand Up @@ -174,7 +173,6 @@ CREATE TABLE test.test_table (
// alters a column in a table multiple times with failures at different stages
// of the migration.
func TestMigrationWithFailuresMultipleAltersOnSameColumn(t *testing.T) {
skip.WithIssue(t, 98991)

const createTableBefore = `
CREATE TABLE test.test_table (
Expand Down Expand Up @@ -245,9 +243,12 @@ func testMigrationWithFailures(

skip.UnderRace(t, "very slow")

// We're going to be migrating from the minimum supported version to the current version.
startCV := clusterversion.ByKey(clusterversion.BinaryMinSupportedVersionKey)
endCV := clusterversion.ByKey(clusterversion.BinaryVersionKey)
// We're going to be migrating from the minimum supported version to the
// "next" version. We'll be injecting the migration for the next version.
startKey := clusterversion.BinaryMinSupportedVersionKey
startCV := clusterversion.ByKey(startKey)
endCV := startCV
endCV.Internal += 2

// The tests follows the following procedure.
//
Expand Down Expand Up @@ -340,6 +341,7 @@ func testMigrationWithFailures(
Server: &server.TestingKnobs{
DisableAutomaticVersionUpgrade: make(chan struct{}),
BinaryVersionOverride: startCV,
BootstrapVersionKeyOverride: startKey,
},
JobsTestingKnobs: jobsKnobs,
SQLExecutor: &sql.ExecutorTestingKnobs{
Expand Down