-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
77337: spanconfig: limit # of tenant span configs r=irfansharif a=irfansharif Fixes #70555. In order to limit the number of span configs a tenant's able to install, we introduce a tenant-side spanconfig.Limiter. It presents the following interface: // Limiter is used to limit the number of span configs installed by // secondary tenants. It considers the committed and uncommitted // state of a table descriptor and computes the "span" delta, each // unit we can apply a configuration over. It uses these deltas to // maintain an aggregate counter, informing the caller if exceeding // the configured limit. type Limiter interface { ShouldLimit( ctx context.Context, txn *kv.Txn, committed, uncommitted catalog.TableDescriptor, ) (bool, error) } This limiter only applies to secondary tenants. The counter is maintained in a newly introduced (tenant-only) system table, using the following schema: CREATE TABLE system.span_count ( singleton BOOL DEFAULT TRUE, span_count INT NOT NULL, CONSTRAINT "primary" PRIMARY KEY (singleton), CONSTRAINT single_row CHECK (singleton), FAMILY "primary" (singleton, span_count) ); We need just two integration points for spanconfig.Limiter: - Right above CheckTwoVersionInvariant, where we're able to hook into the committed and to-be-committed descriptor state before txn commit. - In the GC job, when gc-ing table state. We decrement a table's split count when GC-ing the table for good. The per-tenant span config limit used is controlled by a new tenant read-only cluster setting: spanconfig.tenant_limit. Multi-tenant cluster settings (#73857) provides the infrastructure for the host tenant to be able to control this setting cluster wide, or to target a specific tenant at a time. We also need a migration here, to start tracking span counts for clusters with pre-existing tenants. We introduce a migration that scans over all table descriptors and seeds system.span_count with the right value. Given cluster version gates disseminate asynchronously, we also need a preliminary version to start tracking incremental changes. It's useful to introduce the notion of debt. This will be handy if/when we lower per-tenant limits, and also in the migration above since it's possible for pre-existing tenants to have committed state in violation of the prescribed limit. When in debt, schema changes that add new splits will be rejected (dropping tables/indexes/partitions/etc. will work just fine). When attempting a txn that goes over the configured limit, the UX is as follows: > CREATE TABLE db.t2(i INT PRIMARY KEY); pq: exceeded limit for number of table spans Release note: None Release justification: low risk, high benefit change 79462: colexecproj: break it down into two packages r=yuzefovich a=yuzefovich **colexecproj: split up default cmp proj op file into two** This commit splits up a single file containing two default comparison projection operators into two files. This is done in preparation of the following commit (which will move one of the operators to a different package). Release note: None **colexecproj: extract a new package for projection ops with const** This commit extracts a new `colexecprojconst` package out of `colexecproj` that contains all projection operators with one constant argument. This will allow for faster build speeds since both packages tens of thousands lines of code. Special care had to be taken for default comparison operator because we need to generate two files in different packages based on a single template. I followed the precedent of `sort_partitioner.eg.go` which had to do the same. Addresses: #79357. Release note: None Co-authored-by: irfan sharif <irfanmahmoudsharif@gmail.com> Co-authored-by: Yahor Yuzefovich <yahor@cockroachlabs.com>
- Loading branch information
Showing
103 changed files
with
1,958 additions
and
318 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
252 changes: 252 additions & 0 deletions
252
pkg/ccl/migrationccl/migrationsccl/seed_span_counts_external_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,252 @@ | ||
| // Copyright 2022 The Cockroach Authors. | ||
| // | ||
| // Licensed as a CockroachDB Enterprise file under the Cockroach Community | ||
| // License (the "License"); you may not use this file except in compliance with | ||
| // the License. You may obtain a copy of the License at | ||
| // | ||
| // https://github.com/cockroachdb/cockroach/blob/master/licenses/CCL.txt | ||
|
|
||
| package migrationsccl_test | ||
|
|
||
| import ( | ||
| "context" | ||
| gosql "database/sql" | ||
| "net/url" | ||
| "testing" | ||
|
|
||
| "github.com/cockroachdb/cockroach/pkg/base" | ||
| "github.com/cockroachdb/cockroach/pkg/clusterversion" | ||
| "github.com/cockroachdb/cockroach/pkg/roachpb" | ||
| "github.com/cockroachdb/cockroach/pkg/security" | ||
| "github.com/cockroachdb/cockroach/pkg/server" | ||
| "github.com/cockroachdb/cockroach/pkg/settings/cluster" | ||
| "github.com/cockroachdb/cockroach/pkg/spanconfig" | ||
| "github.com/cockroachdb/cockroach/pkg/testutils" | ||
| "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" | ||
| "github.com/cockroachdb/cockroach/pkg/testutils/testcluster" | ||
| "github.com/cockroachdb/cockroach/pkg/util/leaktest" | ||
| "github.com/cockroachdb/cockroach/pkg/util/log" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| // TestPreSeedSpanCountTable tests that incremental schema changes after | ||
| // PreSeedSpanCountTable is enabled get tracked as such. It also tests that once | ||
| // SeedSpanCountTable is reached, the span count is updated to capture the most | ||
| // up-to-date view of all schema objects. Specifically, we're not | ||
| // double-counting the incremental update we tracked in the | ||
| // PreSeedSpanCountTable state. | ||
| func TestPreSeedSpanCountTable(t *testing.T) { | ||
| defer leaktest.AfterTest(t)() | ||
| defer log.Scope(t).Close(t) | ||
|
|
||
| var ( | ||
| v0 = clusterversion.ByKey(clusterversion.SpanCountTable) | ||
| v1 = clusterversion.ByKey(clusterversion.PreSeedSpanCountTable) | ||
| v2 = clusterversion.ByKey(clusterversion.SeedSpanCountTable) | ||
| ) | ||
|
|
||
| ctx := context.Background() | ||
| settings := cluster.MakeTestingClusterSettingsWithVersions(v2, v0, false /* initializeVersion */) | ||
| require.NoError(t, clusterversion.Initialize(ctx, v0, &settings.SV)) | ||
|
|
||
| tc := testcluster.StartTestCluster(t, 1, base.TestClusterArgs{ | ||
| ServerArgs: base.TestServerArgs{ | ||
| Settings: settings, | ||
| Knobs: base.TestingKnobs{ | ||
| Server: &server.TestingKnobs{ | ||
| DisableAutomaticVersionUpgrade: make(chan struct{}), | ||
| BinaryVersionOverride: v0, | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
|
|
||
| defer tc.Stopper().Stop(ctx) | ||
| ts := tc.Server(0) | ||
| hostDB := sqlutils.MakeSQLRunner(tc.ServerConn(0)) | ||
|
|
||
| tenantID := roachpb.MakeTenantID(10) | ||
| tenantSettings := cluster.MakeTestingClusterSettingsWithVersions(v2, v0, false /* initializeVersion */) | ||
| require.NoError(t, clusterversion.Initialize(ctx, v0, &tenantSettings.SV)) | ||
| tenant, err := ts.StartTenant(ctx, base.TestTenantArgs{ | ||
| TenantID: tenantID, | ||
| TestingKnobs: base.TestingKnobs{}, | ||
| Settings: tenantSettings, | ||
| }) | ||
| require.NoError(t, err) | ||
|
|
||
| pgURL, cleanupPGUrl := sqlutils.PGUrl(t, tenant.SQLAddr(), "Tenant", url.User(security.RootUser)) | ||
| defer cleanupPGUrl() | ||
|
|
||
| tenantSQLDB, err := gosql.Open("postgres", pgURL.String()) | ||
| require.NoError(t, err) | ||
| defer func() { require.NoError(t, tenantSQLDB.Close()) }() | ||
|
|
||
| // Upgrade the host cluster all the way. | ||
| hostDB.Exec(t, "SET CLUSTER SETTING version = $1", v2.String()) | ||
|
|
||
| var spanCount, numRows int | ||
| tenantDB := sqlutils.MakeSQLRunner(tenantSQLDB) | ||
|
|
||
| tenantDB.CheckQueryResults(t, "SHOW CLUSTER SETTING version", [][]string{{v0.String()}}) | ||
| tenantDB.Exec(t, `CREATE TABLE t(k INT PRIMARY KEY)`) | ||
| tenantDB.QueryRow(t, `SELECT count(*) FROM system.span_count`).Scan(&numRows) | ||
| require.Equal(t, 0, numRows) | ||
|
|
||
| tenantDB.Exec(t, "SET CLUSTER SETTING version = $1", v1.String()) | ||
| tenantDB.CheckQueryResults(t, "SHOW CLUSTER SETTING version", [][]string{{v1.String()}}) | ||
| tenantDB.Exec(t, `CREATE INDEX idx ON t (k)`) | ||
| tenantDB.QueryRow(t, `SELECT span_count FROM system.span_count LIMIT 1`).Scan(&spanCount) | ||
| require.Equal(t, 2, spanCount) | ||
|
|
||
| tenantDB.Exec(t, "SET CLUSTER SETTING version = $1", v2.String()) | ||
| tenantDB.CheckQueryResults(t, "SHOW CLUSTER SETTING version", [][]string{{v2.String()}}) | ||
| tenantDB.QueryRow(t, `SELECT span_count FROM system.span_count LIMIT 1`).Scan(&spanCount) | ||
| require.Equal(t, 5, spanCount) | ||
| } | ||
|
|
||
| // TestSeedSpanCountTable tests that the migration seeds system.span_count | ||
| // correctly for secondary tenants. | ||
| func TestSeedSpanCountTable(t *testing.T) { | ||
| defer leaktest.AfterTest(t)() | ||
| defer log.Scope(t).Close(t) | ||
|
|
||
| var ( | ||
| v0 = clusterversion.ByKey(clusterversion.SpanCountTable) | ||
| v2 = clusterversion.ByKey(clusterversion.SeedSpanCountTable) | ||
| ) | ||
|
|
||
| ctx := context.Background() | ||
| settings := cluster.MakeTestingClusterSettingsWithVersions(v2, v0, false /* initializeVersion */) | ||
| require.NoError(t, clusterversion.Initialize(ctx, v0, &settings.SV)) | ||
|
|
||
| tc := testcluster.StartTestCluster(t, 1, base.TestClusterArgs{ | ||
| ServerArgs: base.TestServerArgs{ | ||
| Settings: settings, | ||
| Knobs: base.TestingKnobs{ | ||
| Server: &server.TestingKnobs{ | ||
| DisableAutomaticVersionUpgrade: make(chan struct{}), | ||
| BinaryVersionOverride: v0, | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
|
|
||
| defer tc.Stopper().Stop(ctx) | ||
| ts := tc.Server(0) | ||
| hostDB := sqlutils.MakeSQLRunner(tc.ServerConn(0)) | ||
|
|
||
| tenantID := roachpb.MakeTenantID(10) | ||
| tenantSettings := cluster.MakeTestingClusterSettingsWithVersions(v2, v0, false /* initializeVersion */) | ||
| require.NoError(t, clusterversion.Initialize(ctx, v0, &tenantSettings.SV)) | ||
| tenant, err := ts.StartTenant(ctx, base.TestTenantArgs{ | ||
| TenantID: tenantID, | ||
| TestingKnobs: base.TestingKnobs{}, | ||
| Settings: tenantSettings, | ||
| }) | ||
| require.NoError(t, err) | ||
|
|
||
| pgURL, cleanupPGUrl := sqlutils.PGUrl(t, tenant.SQLAddr(), "Tenant", url.User(security.RootUser)) | ||
| defer cleanupPGUrl() | ||
|
|
||
| tenantSQLDB, err := gosql.Open("postgres", pgURL.String()) | ||
| require.NoError(t, err) | ||
| defer func() { require.NoError(t, tenantSQLDB.Close()) }() | ||
|
|
||
| tenantDB := sqlutils.MakeSQLRunner(tenantSQLDB) | ||
| tenantDB.CheckQueryResults(t, "SHOW CLUSTER SETTING version", [][]string{{v0.String()}}) | ||
|
|
||
| // Upgrade the host cluster. | ||
| hostDB.Exec(t, "SET CLUSTER SETTING version = $1", v2.String()) | ||
| tenantDB.CheckQueryResults(t, "SHOW CLUSTER SETTING version", [][]string{{v0.String()}}) | ||
|
|
||
| tenantDB.Exec(t, `CREATE TABLE t(k INT PRIMARY KEY)`) | ||
|
|
||
| var spanCount, numRows int | ||
| tenantDB.QueryRow(t, `SELECT count(*) FROM system.span_count`).Scan(&numRows) | ||
| require.Equal(t, 0, numRows) | ||
|
|
||
| tenantDB.Exec(t, "SET CLUSTER SETTING version = $1", v2.String()) | ||
| tenantDB.QueryRow(t, `SELECT span_count FROM system.span_count LIMIT 1`).Scan(&spanCount) | ||
| require.Equal(t, 3, spanCount) | ||
| } | ||
|
|
||
| // TestSeedSpanCountTableOverLimit tests that the migration seeds | ||
| // system.span_count correctly for secondary tenants, even if over the | ||
| // proscribed limit. In these cases the tenant goes into debt -- all subsequent | ||
| // schema changes that add schema elements will be rejected. Attempts to free up | ||
| // spans however will be accepted. | ||
| func TestSeedSpanCountTableOverLimit(t *testing.T) { | ||
| defer leaktest.AfterTest(t)() | ||
| defer log.Scope(t).Close(t) | ||
|
|
||
| var ( | ||
| v0 = clusterversion.ByKey(clusterversion.SpanCountTable) | ||
| v2 = clusterversion.ByKey(clusterversion.SeedSpanCountTable) | ||
| ) | ||
|
|
||
| ctx := context.Background() | ||
| settings := cluster.MakeTestingClusterSettingsWithVersions(v2, v0, false /* initializeVersion */) | ||
| require.NoError(t, clusterversion.Initialize(ctx, v0, &settings.SV)) | ||
|
|
||
| tc := testcluster.StartTestCluster(t, 1, base.TestClusterArgs{ | ||
| ServerArgs: base.TestServerArgs{ | ||
| Settings: settings, | ||
| Knobs: base.TestingKnobs{ | ||
| Server: &server.TestingKnobs{ | ||
| DisableAutomaticVersionUpgrade: make(chan struct{}), | ||
| BinaryVersionOverride: v0, | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
|
|
||
| defer tc.Stopper().Stop(ctx) | ||
| ts := tc.Server(0) | ||
| hostDB := sqlutils.MakeSQLRunner(tc.ServerConn(0)) | ||
|
|
||
| const limit = 1 | ||
| tenantID := roachpb.MakeTenantID(10) | ||
| tenantSettings := cluster.MakeTestingClusterSettingsWithVersions(v2, v0, false /* initializeVersion */) | ||
| require.NoError(t, clusterversion.Initialize(ctx, v0, &tenantSettings.SV)) | ||
| tenant, err := ts.StartTenant(ctx, base.TestTenantArgs{ | ||
| TenantID: tenantID, | ||
| TestingKnobs: base.TestingKnobs{ | ||
| SpanConfig: &spanconfig.TestingKnobs{ | ||
| ExcludeDroppedDescriptorsFromLookup: true, | ||
| LimiterLimitOverride: func() int64 { | ||
| return limit | ||
| }, | ||
| }, | ||
| }, | ||
| Settings: tenantSettings, | ||
| }) | ||
| require.NoError(t, err) | ||
|
|
||
| pgURL, cleanupPGUrl := sqlutils.PGUrl(t, tenant.SQLAddr(), "Tenant", url.User(security.RootUser)) | ||
| defer cleanupPGUrl() | ||
|
|
||
| tenantSQLDB, err := gosql.Open("postgres", pgURL.String()) | ||
| require.NoError(t, err) | ||
| defer func() { require.NoError(t, tenantSQLDB.Close()) }() | ||
|
|
||
| // Upgrade the host cluster. | ||
| hostDB.Exec(t, "SET CLUSTER SETTING version = $1", v2.String()) | ||
|
|
||
| tenantDB := sqlutils.MakeSQLRunner(tenantSQLDB) | ||
| tenantDB.Exec(t, `CREATE TABLE t1(k INT PRIMARY KEY)`) | ||
| tenantDB.Exec(t, `CREATE TABLE t2(k INT PRIMARY KEY)`) | ||
| tenantDB.Exec(t, `CREATE TABLE t3(k INT PRIMARY KEY)`) | ||
|
|
||
| var spanCount int | ||
| tenantDB.Exec(t, "SET CLUSTER SETTING version = $1", v2.String()) | ||
| tenantDB.QueryRow(t, `SELECT span_count FROM system.span_count LIMIT 1`).Scan(&spanCount) | ||
| require.Equal(t, 9, spanCount) | ||
|
|
||
| _, err = tenantDB.DB.ExecContext(ctx, `CREATE TABLE t4(k INT PRIMARY KEY)`) | ||
| require.True(t, testutils.IsError(err, "exceeded limit for number of table spans")) | ||
|
|
||
| tenantDB.Exec(t, `DROP TABLE t3`) | ||
| tenantDB.QueryRow(t, `SELECT span_count FROM system.span_count LIMIT 1`).Scan(&spanCount) | ||
| require.Equal(t, 6, spanCount) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| load("@io_bazel_rules_go//go:def.bzl", "go_test") | ||
|
|
||
| go_test( | ||
| name = "spanconfiglimiterccl_test", | ||
| srcs = [ | ||
| "datadriven_test.go", | ||
| "drop_table_test.go", | ||
| "main_test.go", | ||
| ], | ||
| data = glob(["testdata/**"]), | ||
| deps = [ | ||
| "//pkg/base", | ||
| "//pkg/ccl/kvccl/kvtenantccl", | ||
| "//pkg/ccl/partitionccl", | ||
| "//pkg/ccl/utilccl", | ||
| "//pkg/config", | ||
| "//pkg/config/zonepb", | ||
| "//pkg/keys", | ||
| "//pkg/roachpb", | ||
| "//pkg/security", | ||
| "//pkg/security/securitytest", | ||
| "//pkg/server", | ||
| "//pkg/spanconfig", | ||
| "//pkg/spanconfig/spanconfigtestutils/spanconfigtestcluster", | ||
| "//pkg/sql/gcjob", | ||
| "//pkg/testutils", | ||
| "//pkg/testutils/serverutils", | ||
| "//pkg/testutils/sqlutils", | ||
| "//pkg/testutils/testcluster", | ||
| "//pkg/util/leaktest", | ||
| "//pkg/util/log", | ||
| "//pkg/util/randutil", | ||
| "@com_github_cockroachdb_datadriven//:datadriven", | ||
| "@com_github_cockroachdb_errors//:errors", | ||
| "@com_github_stretchr_testify//require", | ||
| ], | ||
| ) |
Oops, something went wrong.