Merge pull request cockroachdb#71477 from ajwerner/ajwerner/release-2…

…1.2-hot-fix

release-21.2: clusterversion,migration: combine migrations for new stats tables

docs/generated/settings/settings-for-tenants.txt

@@ -166,4 +166,4 @@ trace.datadog.project	string	CockroachDB	the project under which traces will be
 trace.debug.enable	boolean	false	if set, traces for recent requests can be seen at https://<ui>/debug/requests
 trace.lightstep.token	string		if set, traces go to Lightstep using this token
 trace.zipkin.collector	string		if set, traces go to the given Zipkin instance (example: '127.0.0.1:9411'). Only one tracer can be configured at a time.
-version	version	21.1-1168	set the active cluster version in the format '<major>.<minor>'
+version	version	21.1-1172	set the active cluster version in the format '<major>.<minor>'

docs/generated/settings/settings.html

@@ -171,6 +171,6 @@
 <tr><td><code>trace.debug.enable</code></td><td>boolean</td><td><code>false</code></td><td>if set, traces for recent requests can be seen at https://<ui>/debug/requests</td></tr>
 <tr><td><code>trace.lightstep.token</code></td><td>string</td><td><code></code></td><td>if set, traces go to Lightstep using this token</td></tr>
 <tr><td><code>trace.zipkin.collector</code></td><td>string</td><td><code></code></td><td>if set, traces go to the given Zipkin instance (example: '127.0.0.1:9411'). Only one tracer can be configured at a time.</td></tr>
-<tr><td><code>version</code></td><td>version</td><td><code>21.1-1168</code></td><td>set the active cluster version in the format '<major>.<minor>'</td></tr>
+<tr><td><code>version</code></td><td>version</td><td><code>21.1-1172</code></td><td>set the active cluster version in the format '<major>.<minor>'</td></tr>
 </tbody>
 </table>

pkg/clusterversion/cockroach_versions.go

@@ -211,9 +211,6 @@ const (
 	DeleteDeprecatedNamespaceTableDescriptorMigration
 	// FixDescriptors is for the migration to fix all descriptors.
 	FixDescriptors
-	// SQLStatsTable adds the system tables for storing persisted SQL statistics
-	// for statements and transactions.
-	SQLStatsTable
 	// DatabaseRoleSettings adds the system table for storing per-user and
 	// per-role default session settings.
 	DatabaseRoleSettings
@@ -268,10 +265,6 @@ const (
 	SpanConfigurationsTable
 	// BoundedStaleness adds capabilities to perform bounded staleness reads.
 	BoundedStaleness
-	// SQLStatsCompactionScheduledJob creates a ScheduledJob for SQL Stats
-	// compaction on cluster startup and ensures that there is only one entry for
-	// the schedule.
-	SQLStatsCompactionScheduledJob
 	// DateAndIntervalStyle enables DateStyle and IntervalStyle to be changed.
 	DateAndIntervalStyle
 	// PebbleFormatVersioned ratchets Pebble's format major version to
@@ -288,6 +281,13 @@ const (
 	// TenantUsageSingleConsumptionColumn changes the tenant_usage system table to
 	// use a single consumption column (encoding a proto).
 	TenantUsageSingleConsumptionColumn
+	// SQLStatsTables adds the system table for storing persisted SQL statistics
+	// for statements.
+	SQLStatsTables
+	// SQLStatsCompactionScheduledJob creates a ScheduledJob for SQL Stats
+	// compaction on cluster startup and ensures that there is only one entry for
+	// the schedule.
+	SQLStatsCompactionScheduledJob
 
 	// *************************************************
 	// Step (1): Add new versions here.
@@ -382,10 +382,6 @@ var versionsSingleton = keyedVersions{
 		Key:     FixDescriptors,
 		Version: roachpb.Version{Major: 21, Minor: 1, Internal: 1114},
 	},
-	{
-		Key:     SQLStatsTable,
-		Version: roachpb.Version{Major: 21, Minor: 1, Internal: 1116},
-	},
 	{
 		Key:     DatabaseRoleSettings,
 		Version: roachpb.Version{Major: 21, Minor: 1, Internal: 1118},
@@ -465,10 +461,6 @@ var versionsSingleton = keyedVersions{
 		Key:     BoundedStaleness,
 		Version: roachpb.Version{Major: 21, Minor: 1, Internal: 1156},
 	},
-	{
-		Key:     SQLStatsCompactionScheduledJob,
-		Version: roachpb.Version{Major: 21, Minor: 1, Internal: 1158},
-	},
 	{
 		Key:     DateAndIntervalStyle,
 		Version: roachpb.Version{Major: 21, Minor: 1, Internal: 1160},
@@ -489,6 +481,14 @@ var versionsSingleton = keyedVersions{
 		Key:     TenantUsageSingleConsumptionColumn,
 		Version: roachpb.Version{Major: 21, Minor: 1, Internal: 1168},
 	},
+	{
+		Key:     SQLStatsTables,
+		Version: roachpb.Version{Major: 21, Minor: 1, Internal: 1170},
+	},
+	{
+		Key:     SQLStatsCompactionScheduledJob,
+		Version: roachpb.Version{Major: 21, Minor: 1, Internal: 1172},
+	},
 	// *************************************************
 	// Step (2): Add new versions here.
 	// Do not add new versions to a patch release.

pkg/migration/migrations/migrations.go

@@ -19,6 +19,7 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/clusterversion"
 	"github.com/cockroachdb/cockroach/pkg/migration"
+	"github.com/cockroachdb/errors"
 )
 
 // GetMigration returns the migration corresponding to this version if
@@ -72,18 +73,6 @@ var migrations = []migration.Migration{
 		NoPrecondition,
 		fixDescriptorMigration,
 	),
-	migration.NewTenantMigration(
-		"add the system.sql_statement_stats table",
-		toCV(clusterversion.SQLStatsTable),
-		NoPrecondition,
-		sqlStatementStatsTableMigration,
-	),
-	migration.NewTenantMigration(
-		"add the system.sql_transaction_stats table",
-		toCV(clusterversion.SQLStatsTable),
-		NoPrecondition,
-		sqlTransactionStatsTableMigration,
-	),
 	migration.NewTenantMigration(
 		"add the system.database_role_settings table",
 		toCV(clusterversion.DatabaseRoleSettings),
@@ -145,10 +134,19 @@ var migrations = []migration.Migration{
 		NoPrecondition,
 		tenantUsageSingleConsumptionColumn,
 	),
+	migration.NewTenantMigration(
+		"add the system.statement_statistics and system.transaction_statistics tables",
+		toCV(clusterversion.SQLStatsTables),
+		NoPrecondition,
+		sqlStatsTablesMigration,
+	),
 }
 
 func init() {
 	for _, m := range migrations {
+		if _, exists := registry[m.ClusterVersion()]; exists {
+			panic(errors.AssertionFailedf("duplicate migration registration for %v", m.ClusterVersion()))
+		}
 		registry[m.ClusterVersion()] = m
 	}
 }

pkg/migration/migrations/sql_stats.go

@@ -16,22 +16,23 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/clusterversion"
 	"github.com/cockroachdb/cockroach/pkg/jobs"
 	"github.com/cockroachdb/cockroach/pkg/migration"
+	"github.com/cockroachdb/cockroach/pkg/sql/catalog"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/systemschema"
 	"github.com/cockroachdb/cockroach/pkg/startupmigrations"
 )
 
-func sqlStatementStatsTableMigration(
+func sqlStatsTablesMigration(
 	ctx context.Context, _ clusterversion.ClusterVersion, d migration.TenantDeps, _ *jobs.Job,
 ) error {
-	return startupmigrations.CreateSystemTable(
-		ctx, d.DB, d.Codec, d.Settings, systemschema.StatementStatisticsTable,
-	)
-}
-
-func sqlTransactionStatsTableMigration(
-	ctx context.Context, _ clusterversion.ClusterVersion, d migration.TenantDeps, _ *jobs.Job,
-) error {
-	return startupmigrations.CreateSystemTable(
-		ctx, d.DB, d.Codec, d.Settings, systemschema.TransactionStatisticsTable,
-	)
+	for _, tab := range []catalog.TableDescriptor{
+		systemschema.StatementStatisticsTable,
+		systemschema.TransactionStatisticsTable,
+	} {
+		if err := startupmigrations.CreateSystemTable(
+			ctx, d.DB, d.Codec, d.Settings, tab,
+		); err != nil {
+			return err
+		}
+	}
+	return nil
 }