Merge #130184

130184: catalog: add support for replicating catalogs for reader virtual clusters r=fqazi a=fqazi This patch adds logic for extracting and creating a PCR reader catalog. This patch will do the following: 1. Introduce a new catalog function catalog.SetupOrAdvanceStandbyReaderCatalog which can be used to advanced or setup a reader catalog from a source tenant. 2. Add logic to allow read only sequence access, so that SQL behaves correctly Fixes: #129439 Note: The first commit in this PR can be ignored, and will be merged via a separate PR #130183 Co-authored-by: Faizan Qazi <[email protected]>
cockroachdb · Sep 10, 2024 · c63a63b · c63a63b
2 parents 3c5e4ad + db05204
commit c63a63b
Show file tree

Hide file tree

Showing 8 changed files with 466 additions and 1 deletion.
diff --git a/pkg/BUILD.bazel b/pkg/BUILD.bazel
@@ -393,6 +393,7 @@ ALL_TESTS = [
     "//pkg/sql/catalog/nstree:nstree_test",
     "//pkg/sql/catalog/randgen:randgen_test",
     "//pkg/sql/catalog/redact:redact_test",
+    "//pkg/sql/catalog/replication:replication_test",
     "//pkg/sql/catalog/resolver:resolver_test",
     "//pkg/sql/catalog/schemadesc:schemadesc_test",
     "//pkg/sql/catalog/schemaexpr:schemaexpr_test",
@@ -1815,6 +1816,8 @@ GO_TARGETS = [
     "//pkg/sql/catalog/randgen:randgen_test",
     "//pkg/sql/catalog/redact:redact",
     "//pkg/sql/catalog/redact:redact_test",
+    "//pkg/sql/catalog/replication:replication",
+    "//pkg/sql/catalog/replication:replication_test",
     "//pkg/sql/catalog/resolver:resolver",
     "//pkg/sql/catalog/resolver:resolver_test",
     "//pkg/sql/catalog/rewrite:rewrite",

diff --git a/pkg/sql/catalog/descpb/structured.go b/pkg/sql/catalog/descpb/structured.go
@@ -230,6 +230,11 @@ func (desc *TableDescriptor) MaterializedView() bool {
 	return desc.IsMaterializedView
 }
 
+// IsReadOnly implements the TableDescriptor interface.
+func (desc *TableDescriptor) IsReadOnly() bool {
+	return desc.IsMaterializedView || desc.GetExternal() != nil
+}
+
 // IsPhysicalTable implements the TableDescriptor interface.
 func (desc *TableDescriptor) IsPhysicalTable() bool {
 	return desc.IsSequence() || (desc.IsTable() && !desc.IsVirtualTable()) || desc.MaterializedView()

diff --git a/pkg/sql/catalog/descriptor.go b/pkg/sql/catalog/descriptor.go
@@ -337,6 +337,9 @@ type TableDescriptor interface {
 	IsPhysicalTable() bool
 	// MaterializedView returns whether this TableDescriptor is a MaterializedView.
 	MaterializedView() bool
+	// IsReadOnly returns if this table descriptor has external data, and cannot
+	// be written to.
+	IsReadOnly() bool
 	// IsAs returns true if the TableDescriptor describes a Table that was created
 	// with a CREATE TABLE AS command.
 	IsAs() bool

diff --git a/pkg/sql/catalog/replication/BUILD.bazel b/pkg/sql/catalog/replication/BUILD.bazel
@@ -0,0 +1,44 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+
+go_library(
+    name = "replication",
+    srcs = ["reader_catalog.go"],
+    importpath = "github.com/cockroachdb/cockroach/pkg/sql/catalog/replication",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//pkg/keys",
+        "//pkg/kv",
+        "//pkg/roachpb",
+        "//pkg/settings/cluster",
+        "//pkg/sql/catalog",
+        "//pkg/sql/catalog/dbdesc",
+        "//pkg/sql/catalog/descpb",
+        "//pkg/sql/catalog/descs",
+        "//pkg/sql/catalog/funcdesc",
+        "//pkg/sql/catalog/nstree",
+        "//pkg/sql/catalog/schemadesc",
+        "//pkg/sql/catalog/tabledesc",
+        "//pkg/sql/catalog/typedesc",
+        "//pkg/util/hlc",
+        "//pkg/util/protoutil",
+        "@com_github_cockroachdb_errors//:errors",
+    ],
+)
+
+go_test(
+    name = "replication_test",
+    srcs = ["reader_catalog_test.go"],
+    deps = [
+        ":replication",
+        "//pkg/base",
+        "//pkg/security/securityassets",
+        "//pkg/security/securitytest",
+        "//pkg/server",
+        "//pkg/sql",
+        "//pkg/testutils/serverutils",
+        "//pkg/testutils/sqlutils",
+        "//pkg/testutils/testcluster",
+        "//pkg/util/randutil",
+        "@com_github_stretchr_testify//require",
+    ],
+)
diff --git a/pkg/sql/catalog/replication/reader_catalog.go b/pkg/sql/catalog/replication/reader_catalog.go
@@ -0,0 +1,252 @@
+// Copyright 2024 The Cockroach Authors.
+//
+// Use of this software is governed by the Business Source License
+// included in the file licenses/BSL.txt.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0, included in the file
+// licenses/APL.txt.
+
+package replication
+
+import (
+	"context"
+
+	"github.com/cockroachdb/cockroach/pkg/keys"
+	"github.com/cockroachdb/cockroach/pkg/kv"
+	"github.com/cockroachdb/cockroach/pkg/roachpb"
+	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
+	"github.com/cockroachdb/cockroach/pkg/sql/catalog"
+	"github.com/cockroachdb/cockroach/pkg/sql/catalog/dbdesc"
+	"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
+	"github.com/cockroachdb/cockroach/pkg/sql/catalog/descs"
+	"github.com/cockroachdb/cockroach/pkg/sql/catalog/funcdesc"
+	"github.com/cockroachdb/cockroach/pkg/sql/catalog/nstree"
+	"github.com/cockroachdb/cockroach/pkg/sql/catalog/schemadesc"
+	"github.com/cockroachdb/cockroach/pkg/sql/catalog/tabledesc"
+	"github.com/cockroachdb/cockroach/pkg/sql/catalog/typedesc"
+	"github.com/cockroachdb/cockroach/pkg/util/hlc"
+	"github.com/cockroachdb/cockroach/pkg/util/protoutil"
+	"github.com/cockroachdb/errors"
+)
+
+// SetupOrAdvanceStandbyReaderCatalog when invoked inside the reader
+// tenant will replicate the descriptors from the tenant specified
+// by fromID. The replicated descriptors will be setup such that they
+// will access data from fromID. If the descriptors are already replicated
+// then this function will advance the timestamp.
+func SetupOrAdvanceStandbyReaderCatalog(
+	ctx context.Context,
+	fromID roachpb.TenantID,
+	asOf hlc.Timestamp,
+	descsCol descs.DB,
+	st *cluster.Settings,
+) error {
+	extracted, err := getCatalogForTenantAsOf(ctx, st, descsCol.KV(), fromID, asOf)
+	if err != nil {
+		return err
+	}
+	return descsCol.DescsTxn(
+		ctx, func(ctx context.Context, txn descs.Txn) error {
+			// Track which descriptors / namespaces that have been updated,
+			// the difference between any existing tenant in the reader
+			// catalog will be deleted (i.e. these are descriptors that exist
+			// in the reader tenant, but not in the from tenant which we are
+			// replicating).
+			descriptorsUpdated := catalog.DescriptorIDSet{}
+			namespaceUpdated := catalog.DescriptorIDSet{}
+			allExistingDescs, err := txn.Descriptors().GetAll(ctx, txn.KV())
+			if err != nil {
+				return err
+			}
+			// Resolve any existing descriptors within the tenant, which
+			// will be use to compute old values for writing.
+			b := txn.KV().NewBatch()
+			if err := extracted.ForEachDescriptor(func(fromDesc catalog.Descriptor) error {
+				if !shouldSetupForReader(fromDesc.GetID(), fromDesc.GetParentID()) {
+					return nil
+				}
+				// Track this descriptor was updated.
+				descriptorsUpdated.Add(fromDesc.GetID())
+				// If there is an existing descriptor with the same ID, we should
+				// determine the old bytes in storage for the upsert.
+				var existingRawBytes []byte
+				existingDesc, err := txn.Descriptors().MutableByID(txn.KV()).Desc(ctx, fromDesc.GetID())
+				if err == nil {
+					existingRawBytes = existingDesc.GetRawBytesInStorage()
+				} else if errors.Is(err, catalog.ErrDescriptorNotFound) {
+					err = nil
+				} else {
+					return err
+				}
+				// Existing descriptor should never be a system descriptor.
+				if existingDesc != nil &&
+					existingDesc.GetParentID() != fromDesc.GetParentID() {
+					return errors.AssertionFailedf("existing descriptor in the reader catalog "+
+						"collides with a descriptor in the from tenant, with differring parent databases.\n"+
+						"existing descriptor %s (id: %d, parentID: %d)\n "+
+						"from descriptor: %s (id: %d, parentID: %d)\n",
+						existingDesc.GetName(), existingDesc.GetID(), existingDesc.GetParentID(),
+						fromDesc.GetName(), fromDesc.GetID(), fromDesc.GetParentID())
+				}
+				var mut catalog.MutableDescriptor
+				switch t := fromDesc.DescriptorProto().GetUnion().(type) {
+				case *descpb.Descriptor_Table:
+					t.Table.Version = 1
+					var mutBuilder tabledesc.TableDescriptorBuilder
+					var mutTbl *tabledesc.Mutable
+					if existingRawBytes != nil {
+						t.Table.Version = existingDesc.GetVersion()
+						mutBuilder = existingDesc.NewBuilder().(tabledesc.TableDescriptorBuilder)
+						mutTbl = mutBuilder.BuildExistingMutableTable()
+						mutTbl.TableDescriptor = *protoutil.Clone(t.Table).(*descpb.TableDescriptor)
+					} else {
+						mutBuilder = tabledesc.NewBuilder(t.Table)
+						mutTbl = mutBuilder.BuildCreatedMutableTable()
+					}
+					mut = mutTbl
+					// Convert any physical tables into external row tables.
+					// Note: Materialized views will be converted, but their
+					// view definition will be wiped.
+					if mutTbl.IsPhysicalTable() {
+						mutTbl.ViewQuery = ""
+						mutTbl.SetExternalRowData(&descpb.ExternalRowData{TenantID: fromID, TableID: fromDesc.GetID(), AsOf: asOf})
+					}
+				case *descpb.Descriptor_Database:
+					t.Database.Version = 1
+					var mutBuilder dbdesc.DatabaseDescriptorBuilder
+					if existingRawBytes != nil {
+						t.Database.Version = existingDesc.GetVersion()
+						mutBuilder = existingDesc.NewBuilder().(dbdesc.DatabaseDescriptorBuilder)
+						mutDB := mutBuilder.BuildExistingMutableDatabase()
+						mutDB.DatabaseDescriptor = *protoutil.Clone(t.Database).(*descpb.DatabaseDescriptor)
+						mut = mutDB
+					} else {
+						mutBuilder = dbdesc.NewBuilder(t.Database)
+						mut = mutBuilder.BuildCreatedMutable()
+					}
+				case *descpb.Descriptor_Schema:
+					t.Schema.Version = 1
+					var mutBuilder schemadesc.SchemaDescriptorBuilder
+					if existingRawBytes != nil {
+						t.Schema.Version = existingDesc.GetVersion()
+						mutBuilder = existingDesc.NewBuilder().(schemadesc.SchemaDescriptorBuilder)
+						mutSchema := mutBuilder.BuildExistingMutableSchema()
+						mutSchema.SchemaDescriptor = *protoutil.Clone(t.Schema).(*descpb.SchemaDescriptor)
+						mut = mutSchema
+					} else {
+						mutBuilder = schemadesc.NewBuilder(t.Schema)
+						mut = mutBuilder.BuildCreatedMutable()
+					}
+				case *descpb.Descriptor_Function:
+					t.Function.Version = 1
+					var mutBuilder funcdesc.FunctionDescriptorBuilder
+					if existingRawBytes != nil {
+						t.Function.Version = existingDesc.GetVersion()
+						mutBuilder = existingDesc.NewBuilder().(funcdesc.FunctionDescriptorBuilder)
+						mutFunction := mutBuilder.BuildExistingMutableFunction()
+						mutFunction.FunctionDescriptor = *protoutil.Clone(t.Function).(*descpb.FunctionDescriptor)
+						mut = mutFunction
+					} else {
+						mutBuilder = funcdesc.NewBuilder(t.Function)
+						mut = mutBuilder.BuildCreatedMutable()
+					}
+				case *descpb.Descriptor_Type:
+					t.Type.Version = 1
+					var mutBuilder typedesc.TypeDescriptorBuilder
+					if existingRawBytes != nil {
+						t.Type.Version = existingDesc.GetVersion()
+						mutBuilder = existingDesc.NewBuilder().(typedesc.TypeDescriptorBuilder)
+						mutType := mutBuilder.BuildExistingMutableType()
+						mutType.TypeDescriptor = *protoutil.Clone(t.Type).(*descpb.TypeDescriptor)
+						mut = mutType
+					} else {
+						mutBuilder = typedesc.NewBuilder(t.Type)
+						mut = mutBuilder.BuildCreatedMutable()
+					}
+				default:
+					return errors.AssertionFailedf("unknown descriptor type: %T", t)
+				}
+				return errors.Wrapf(txn.Descriptors().WriteDescToBatch(ctx, true, mut, b),
+					"unable to create replicated descriptor: %d %T", mut.GetID(), mut)
+			}); err != nil {
+				return err
+			}
+			if err := extracted.ForEachNamespaceEntry(func(e nstree.NamespaceEntry) error {
+				if !shouldSetupForReader(e.GetID(), e.GetParentID()) {
+					return nil
+				}
+				namespaceUpdated.Add(e.GetID())
+				return errors.Wrapf(txn.Descriptors().UpsertNamespaceEntryToBatch(ctx, true, e, b), "namespace entry %v", e)
+			}); err != nil {
+				return err
+			}
+			// Figure out which descriptors should be deleted.
+			if err := allExistingDescs.ForEachDescriptor(func(desc catalog.Descriptor) error {
+				// Skip descriptors that were updated above
+				if !shouldSetupForReader(desc.GetID(), desc.GetParentID()) ||
+					descriptorsUpdated.Contains(desc.GetID()) {
+					return nil
+				}
+				// Delete the descriptor from the batch
+				return errors.Wrapf(txn.Descriptors().DeleteDescToBatch(ctx, true, desc.GetID(), b),
+					"deleting descriptor")
+			}); err != nil {
+				return err
+			}
+			// Figure out which namespaces should be deleted.
+			if err := allExistingDescs.ForEachNamespaceEntry(func(e nstree.NamespaceEntry) error {
+				// Skip descriptors that were updated above
+				if !shouldSetupForReader(e.GetID(), e.GetParentID()) ||
+					descriptorsUpdated.Contains(e.GetID()) {
+					return nil
+				}
+				return errors.Wrapf(txn.Descriptors().DeleteNamespaceEntryToBatch(ctx, true, e, b),
+					"deleting namespace")
+			}); err != nil {
+				return err
+			}
+			return errors.Wrap(txn.KV().Run(ctx, b), "executing bach for updating catalog")
+		})
+}
+
+// shouldSetupForReader determines if a descriptor should be setup
+// access via external row data.
+func shouldSetupForReader(id descpb.ID, parentID descpb.ID) bool {
+	switch id {
+	case keys.UsersTableID, keys.RoleMembersTableID, keys.RoleOptionsTableID,
+		keys.DatabaseRoleSettingsTableID, keys.TableStatisticsTableID:
+		return true
+	default:
+		return parentID != keys.SystemDatabaseID &&
+			id != keys.SystemDatabaseID
+	}
+}
+
+// getCatalogForTenantAsOf reads the descriptors from a given tenant
+// at the given timestamp.
+func getCatalogForTenantAsOf(
+	ctx context.Context,
+	st *cluster.Settings,
+	db *kv.DB,
+	tenantID roachpb.TenantID,
+	asOf hlc.Timestamp,
+) (all nstree.Catalog, _ error) {
+	cf := descs.NewBareBonesCollectionFactory(st, keys.MakeSQLCodec(tenantID))
+	err := db.Txn(ctx, func(ctx context.Context, txn *kv.Txn) error {
+		err := txn.SetFixedTimestamp(ctx, asOf)
+		if err != nil {
+			return err
+		}
+		descsCol := cf.NewCollection(ctx)
+		defer descsCol.ReleaseAll(ctx)
+		all, err = descsCol.GetAllFromStorageUnvalidated(ctx, txn)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	})
+	return all, err
+}