Merge pull request #143091 from cockroachdb/blathers/backport-release-24.3-143007

release-24.3: upgrades: skip creating defaultdb/postgres dbs during PCR reader tenant startup

Author: msbutler

Diff for: pkg/upgrade/upgrades/BUILD.bazel

@@ -62,6 +62,7 @@ go_library(
         "//pkg/upgrade/upgradebase",
         "//pkg/util/buildutil",
         "//pkg/util/envutil",
+        "//pkg/util/hlc",
         "//pkg/util/log",
         "//pkg/util/log/logcrash",
         "//pkg/util/protoutil",

Diff for: pkg/upgrade/upgrades/permanent_maybe_setup_pcr_reader.go

@@ -23,7 +23,7 @@ func maybeSetupPCRStandbyReader(
 	if d.TenantInfoAccessor == nil {
 		return nil
 	}
-	id, ts, err := d.TenantInfoAccessor.ReadFromTenantInfo(ctx)
+	id, ts, err := readerTenantInfo(ctx, d)
 	if err != nil {
 		return err
 	}

Diff for: pkg/upgrade/upgrades/permanent_upgrades.go

@@ -20,6 +20,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
 	"github.com/cockroachdb/cockroach/pkg/sql/sessiondata"
 	"github.com/cockroachdb/cockroach/pkg/upgrade"
+	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/protoutil"
 	"github.com/cockroachdb/errors"
@@ -234,6 +235,12 @@ func createDefaultDbs(
 	// already.
 	const createDbStmt = `CREATE DATABASE IF NOT EXISTS "%s" WITH OWNER root`
 
+	id, _, _ := readerTenantInfo(ctx, deps)
+	if id.IsSet() {
+		// Don't create the default databases for read from standby tenants.
+		return nil
+	}
+
 	var err error
 	for _, dbName := range []string{catalogkeys.DefaultDatabaseName, catalogkeys.PgDatabaseName} {
 		stmt := fmt.Sprintf(createDbStmt, dbName)
@@ -245,3 +252,21 @@ func createDefaultDbs(
 	}
 	return nil
 }
+
+// readerTenantInfo returns the tenant ID and timestamp if we're spinning up a
+// read from standby tenant.
+func readerTenantInfo(
+	ctx context.Context, d upgrade.TenantDeps,
+) (roachpb.TenantID, hlc.Timestamp, error) {
+	if d.TenantInfoAccessor == nil {
+		return roachpb.TenantID{}, hlc.Timestamp{}, nil
+	}
+	id, ts, err := d.TenantInfoAccessor.ReadFromTenantInfo(ctx)
+	if err != nil {
+		return roachpb.TenantID{}, hlc.Timestamp{}, err
+	}
+	if !id.IsSet() {
+		return roachpb.TenantID{}, hlc.Timestamp{}, nil
+	}
+	return id, ts, nil
+}