upgrades: remove migration that waits for schema changes

pkg/clusterversion/cockroach_versions.go

@@ -254,10 +254,6 @@ const (
 	TODODelete_V22_2SetRoleOptionsUserIDColumnNotNull
 	// TODODelete_V22_2RangefeedUseOneStreamPerNode changes rangefeed implementation to use 1 RPC stream per node.
 	TODODelete_V22_2RangefeedUseOneStreamPerNode
-	// TODODelete_V22_2NoNonMVCCAddSSTable adds a migration which waits for all
-	// schema changes to complete. After this point, no non-MVCC
-	// AddSSTable calls will be used outside of tenant streaming.
-	TODODelete_V22_2NoNonMVCCAddSSTable
 	// TODODelete_V22_2TTLDistSQL uses DistSQL to distribute TTL SELECT/DELETE statements to
 	// leaseholder nodes.
 	TODODelete_V22_2TTLDistSQL
@@ -678,10 +674,6 @@ var rawVersionsSingleton = keyedVersions{
 		Key:     TODODelete_V22_2RangefeedUseOneStreamPerNode,
 		Version: roachpb.Version{Major: 22, Minor: 1, Internal: 60},
 	},
-	{
-		Key:     TODODelete_V22_2NoNonMVCCAddSSTable,
-		Version: roachpb.Version{Major: 22, Minor: 1, Internal: 62},
-	},
 	{
 		Key:     TODODelete_V22_2TTLDistSQL,
 		Version: roachpb.Version{Major: 22, Minor: 1, Internal: 68},

pkg/upgrade/upgrades/BUILD.bazel

@@ -36,7 +36,6 @@ go_library(
         "tenant_table_migration.go",
         "upgrades.go",
         "wait_for_del_range_in_gc_job.go",
-        "wait_for_schema_changes.go",
         "web_sessions_table_user_id_migration.go",
     ],
     importpath = "github.com/cockroachdb/cockroach/pkg/upgrade/upgrades",
@@ -123,7 +122,6 @@ go_test(
         "system_statistics_activity_test.go",
         "tenant_table_migration_test.go",
         "wait_for_del_range_in_gc_job_test.go",
-        "wait_for_schema_changes_test.go",
         "web_sessions_table_user_id_migration_test.go",
     ],
     args = ["-test.timeout=895s"],
@@ -185,7 +183,6 @@ go_test(
         "//pkg/util/intsets",
         "//pkg/util/leaktest",
         "//pkg/util/log",
-        "//pkg/util/protoutil",
         "//pkg/util/syncutil",
         "//pkg/util/timeutil",
         "@com_github_cockroachdb_errors//:errors",

pkg/upgrade/upgrades/schemachanger_elements_test.go

@@ -15,6 +15,7 @@ import (
 	gosql "database/sql"
 	"sync/atomic"
 	"testing"
+	"time"
 
 	"github.com/cockroachdb/cockroach/pkg/clusterversion"
 	"github.com/cockroachdb/cockroach/pkg/jobs"
@@ -27,6 +28,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/testutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
+	"github.com/cockroachdb/cockroach/pkg/util"
 	"github.com/cockroachdb/cockroach/pkg/util/ctxgroup"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -203,3 +205,11 @@ func TestUpgradeSchemaChangerElements(t *testing.T) {
 		})
 	}
 }
+
+func shortInterval() *time.Duration {
+	shortInterval := 10 * time.Millisecond
+	if util.RaceEnabled {
+		shortInterval *= 5
+	}
+	return &shortInterval
+}

pkg/upgrade/upgrades/upgrades.go

@@ -117,12 +117,6 @@ var upgrades = []upgradebase.Upgrade{
 		upgrade.NoPrecondition,
 		ensureSQLSchemaTelemetrySchedule,
 	),
-	upgrade.NewTenantUpgrade(
-		"wait for all in-flight schema changes",
-		toCV(clusterversion.TODODelete_V22_2NoNonMVCCAddSSTable),
-		upgrade.NoPrecondition,
-		waitForAllSchemaChanges,
-	),
 	upgrade.NewTenantUpgrade("fix corrupt user-file related table descriptors",
 		toCV(clusterversion.TODODelete_V22_2FixUserfileRelatedDescriptorCorruption),
 		upgrade.NoPrecondition,