From 0cb0fb8ef520a09da9905d18cf78c0b32bfa4110 Mon Sep 17 00:00:00 2001 From: Andrew Werner Date: Mon, 10 Feb 2020 17:41:23 -0500 Subject: [PATCH 1/2] zone: change default range size to 16GB with min size of 2GB This is an experimental change to increase the default range size. It will only apply to new cluster. This range size is intentionally very large in order to stress the impact of the change. The hope is to validate the change at this size with an intention of shipping with something like 512MB/64MB. Release note (general change): New clusters will use an increased default range size of 2GB and will no longer be merged if larger than 128MB as opposed to the previous 16MB. This change will not affect pre-existing clusters. Range size settings are controlled through zone configs. --- .../testdata/logic_test/crdb_internal | 28 ++-- .../testdata/logic_test/distsql_partitioning | 144 ++++++++-------- .../testdata/logic_test/partitioning | 156 +++++++++--------- pkg/ccl/logictestccl/testdata/logic_test/zone | 36 ++-- pkg/config/zonepb/zone.go | 8 +- .../logictest/testdata/logic_test/alter_table | 1 - .../testdata/logic_test/crdb_internal | 6 +- .../testdata/logic_test/create_statements | 1 - .../logictest/testdata/logic_test/show_create | 1 - .../logictest/testdata/logic_test/zone_config | 14 +- 10 files changed, 196 insertions(+), 199 deletions(-) diff --git a/pkg/ccl/logictestccl/testdata/logic_test/crdb_internal b/pkg/ccl/logictestccl/testdata/logic_test/crdb_internal index 9d32c9143e5a..bea0d3f26bea 100644 --- a/pkg/ccl/logictestccl/testdata/logic_test/crdb_internal +++ b/pkg/ccl/logictestccl/testdata/logic_test/crdb_internal @@ -79,29 +79,29 @@ SELECT * FROM [SHOW ALL ZONE CONFIGURATIONS] ORDER BY 1 INDEX test.public.t4@myt4index ALTER INDEX test.public.t4@myt4index CONFIGURE ZONE USING num_replicas = 5 RANGE default ALTER RANGE default CONFIGURE ZONE USING - range_min_bytes = 16777216, - range_max_bytes = 67108864, + range_min_bytes = 17179869184, + range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[]', lease_preferences = '[]' RANGE liveness ALTER RANGE liveness CONFIGURE ZONE USING - range_min_bytes = 16777216, - range_max_bytes = 67108864, + range_min_bytes = 17179869184, + range_max_bytes = 34359738368, gc.ttlseconds = 600, num_replicas = 5, constraints = '[]', lease_preferences = '[]' RANGE meta ALTER RANGE meta CONFIGURE ZONE USING - range_min_bytes = 16777216, - range_max_bytes = 67108864, + range_min_bytes = 17179869184, + range_max_bytes = 34359738368, gc.ttlseconds = 3600, num_replicas = 5, constraints = '[]', lease_preferences = '[]' RANGE system ALTER RANGE system CONFIGURE ZONE USING - range_min_bytes = 16777216, - range_max_bytes = 67108864, + range_min_bytes = 17179869184, + range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 5, constraints = '[]', @@ -125,8 +125,8 @@ query TT SHOW ZONE CONFIGURATION FOR INDEX myt4index ---- INDEX test.public.t4@myt4index ALTER INDEX test.public.t4@myt4index CONFIGURE ZONE USING - range_min_bytes = 16777216, - range_max_bytes = 67108864, + range_min_bytes = 17179869184, + range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 5, constraints = '[]', @@ -136,8 +136,8 @@ query TT SHOW ZONE CONFIGURATION FOR TABLE t4 ---- TABLE t4 ALTER TABLE t4 CONFIGURE ZONE USING - range_min_bytes = 16777216, - range_max_bytes = 67108864, + range_min_bytes = 17179869184, + range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 7, constraints = '[]', @@ -147,8 +147,8 @@ query TT SHOW ZONE CONFIGURATION FOR RANGE default ---- RANGE default ALTER RANGE default CONFIGURE ZONE USING - range_min_bytes = 16777216, - range_max_bytes = 67108864, + range_min_bytes = 17179869184, + range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[]', diff --git a/pkg/ccl/logictestccl/testdata/logic_test/distsql_partitioning b/pkg/ccl/logictestccl/testdata/logic_test/distsql_partitioning index 78fc829300f2..b9fa0de89ff5 100644 --- a/pkg/ccl/logictestccl/testdata/logic_test/distsql_partitioning +++ b/pkg/ccl/logictestccl/testdata/logic_test/distsql_partitioning @@ -16,20 +16,20 @@ query TTTTTTTTT colnames SHOW PARTITIONS FROM DATABASE test ---- database_name table_name partition_name parent_partition column_names index_name partition_value zone_config full_zone_config -test t1 p1 NULL x t1@primary (1) NULL range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t1 p1 NULL x t1@primary (1) NULL range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[]', lease_preferences = '[]' -test t1 p2 NULL x t1@primary (2) NULL range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t1 p2 NULL x t1@primary (2) NULL range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[]', lease_preferences = '[]' -test t1 p3 NULL x t1@primary (3) NULL range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t1 p3 NULL x t1@primary (3) NULL range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[]', @@ -44,20 +44,20 @@ query TTTTTTTTT colnames SHOW PARTITIONS FROM DATABASE test ---- database_name table_name partition_name parent_partition column_names index_name partition_value zone_config full_zone_config -test t1 p1 NULL x t1@primary (1) constraints = '[+dc=dc1]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t1 p1 NULL x t1@primary (1) constraints = '[+dc=dc1]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc1]', lease_preferences = '[]' -test t1 p2 NULL x t1@primary (2) constraints = '[+dc=dc2]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t1 p2 NULL x t1@primary (2) constraints = '[+dc=dc2]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc2]', lease_preferences = '[]' -test t1 p3 NULL x t1@primary (3) constraints = '[+dc=dc3]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t1 p3 NULL x t1@primary (3) constraints = '[+dc=dc3]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc3]', @@ -66,20 +66,20 @@ lease_preferences = '[]' query TTTTTTTTT SHOW PARTITIONS FROM TABLE t1 ---- -test t1 p1 NULL x t1@primary (1) constraints = '[+dc=dc1]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t1 p1 NULL x t1@primary (1) constraints = '[+dc=dc1]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc1]', lease_preferences = '[]' -test t1 p2 NULL x t1@primary (2) constraints = '[+dc=dc2]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t1 p2 NULL x t1@primary (2) constraints = '[+dc=dc2]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc2]', lease_preferences = '[]' -test t1 p3 NULL x t1@primary (3) constraints = '[+dc=dc3]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t1 p3 NULL x t1@primary (3) constraints = '[+dc=dc3]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc3]', @@ -88,20 +88,20 @@ lease_preferences = '[]' query TTTTTTTTT SHOW PARTITIONS FROM INDEX t1@primary ---- -test t1 p1 NULL x t1@primary (1) constraints = '[+dc=dc1]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t1 p1 NULL x t1@primary (1) constraints = '[+dc=dc1]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc1]', lease_preferences = '[]' -test t1 p2 NULL x t1@primary (2) constraints = '[+dc=dc2]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t1 p2 NULL x t1@primary (2) constraints = '[+dc=dc2]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc2]', lease_preferences = '[]' -test t1 p3 NULL x t1@primary (3) constraints = '[+dc=dc3]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t1 p3 NULL x t1@primary (3) constraints = '[+dc=dc3]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc3]', @@ -123,32 +123,32 @@ ALTER PARTITION p2 OF TABLE t2 CONFIGURE ZONE USING constraints='[+dc=dc2]' query TTTTTTTTT SHOW PARTITIONS FROM DATABASE test ---- -test t1 p1 NULL x t1@primary (1) constraints = '[+dc=dc1]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t1 p1 NULL x t1@primary (1) constraints = '[+dc=dc1]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc1]', lease_preferences = '[]' -test t1 p2 NULL x t1@primary (2) constraints = '[+dc=dc2]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t1 p2 NULL x t1@primary (2) constraints = '[+dc=dc2]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc2]', lease_preferences = '[]' -test t1 p3 NULL x t1@primary (3) constraints = '[+dc=dc3]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t1 p3 NULL x t1@primary (3) constraints = '[+dc=dc3]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc3]', lease_preferences = '[]' -test t2 p1 NULL x t2@primary (1) TO (2) constraints = '[+dc=dc1]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t2 p1 NULL x t2@primary (1) TO (2) constraints = '[+dc=dc1]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc1]', lease_preferences = '[]' -test t2 p2 NULL x t2@primary (2) TO (3) constraints = '[+dc=dc2]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t2 p2 NULL x t2@primary (2) TO (3) constraints = '[+dc=dc2]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc2]', @@ -157,14 +157,14 @@ lease_preferences = '[]' query TTTTTTTTT SHOW PARTITIONS FROM TABLE t2 ---- -test t2 p1 NULL x t2@primary (1) TO (2) constraints = '[+dc=dc1]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t2 p1 NULL x t2@primary (1) TO (2) constraints = '[+dc=dc1]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc1]', lease_preferences = '[]' -test t2 p2 NULL x t2@primary (2) TO (3) constraints = '[+dc=dc2]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t2 p2 NULL x t2@primary (2) TO (3) constraints = '[+dc=dc2]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc2]', @@ -173,14 +173,14 @@ lease_preferences = '[]' query TTTTTTTTT SHOW PARTITIONS FROM INDEX t2@primary ---- -test t2 p1 NULL x t2@primary (1) TO (2) constraints = '[+dc=dc1]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t2 p1 NULL x t2@primary (1) TO (2) constraints = '[+dc=dc1]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc1]', lease_preferences = '[]' -test t2 p2 NULL x t2@primary (2) TO (3) constraints = '[+dc=dc2]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t2 p2 NULL x t2@primary (2) TO (3) constraints = '[+dc=dc2]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc2]', @@ -210,26 +210,26 @@ ALTER PARTITION p4 OF INDEX t3@sec CONFIGURE ZONE USING constraints='[+dc=dc4]' query TTTTTTTTT SHOW PARTITIONS FROM TABLE t3 ---- -test t3 p1 NULL x t3@primary (1) constraints = '[+dc=dc1]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t3 p1 NULL x t3@primary (1) constraints = '[+dc=dc1]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc1]', lease_preferences = '[]' -test t3 p2 NULL x t3@primary (2) constraints = '[+dc=dc2]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t3 p2 NULL x t3@primary (2) constraints = '[+dc=dc2]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc2]', lease_preferences = '[]' -test t3 p3 NULL y t3@sec (3) constraints = '[+dc=dc3]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t3 p3 NULL y t3@sec (3) constraints = '[+dc=dc3]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc3]', lease_preferences = '[]' -test t3 p4 NULL y t3@sec (4) constraints = '[+dc=dc4]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t3 p4 NULL y t3@sec (4) constraints = '[+dc=dc4]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc4]', @@ -238,26 +238,26 @@ lease_preferences = '[]' query TTTTTTTTT SHOW PARTITIONS FROM INDEX t3@* ---- -test t3 p1 NULL x t3@primary (1) constraints = '[+dc=dc1]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t3 p1 NULL x t3@primary (1) constraints = '[+dc=dc1]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc1]', lease_preferences = '[]' -test t3 p2 NULL x t3@primary (2) constraints = '[+dc=dc2]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t3 p2 NULL x t3@primary (2) constraints = '[+dc=dc2]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc2]', lease_preferences = '[]' -test t3 p3 NULL y t3@sec (3) constraints = '[+dc=dc3]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t3 p3 NULL y t3@sec (3) constraints = '[+dc=dc3]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc3]', lease_preferences = '[]' -test t3 p4 NULL y t3@sec (4) constraints = '[+dc=dc4]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t3 p4 NULL y t3@sec (4) constraints = '[+dc=dc4]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc4]', @@ -266,14 +266,14 @@ lease_preferences = '[]' query TTTTTTTTT SHOW PARTITIONS FROM INDEX t3@sec ---- -test t3 p3 NULL y t3@sec (3) constraints = '[+dc=dc3]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t3 p3 NULL y t3@sec (3) constraints = '[+dc=dc3]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc3]', lease_preferences = '[]' -test t3 p4 NULL y t3@sec (4) constraints = '[+dc=dc4]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t3 p4 NULL y t3@sec (4) constraints = '[+dc=dc4]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc4]', @@ -303,32 +303,32 @@ ALTER PARTITION p2_a OF TABLE t4 CONFIGURE ZONE USING constraints='[+dc=dc5]' query TTTTTTTTT SHOW PARTITIONS FROM TABLE t4 ---- -test t4 p1 NULL x t4@primary (1) constraints = '[+dc=dc1]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t4 p1 NULL x t4@primary (1) constraints = '[+dc=dc1]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc1]', lease_preferences = '[]' -test t4 p1_a p1 y t4@primary (2) constraints = '[+dc=dc2]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t4 p1_a p1 y t4@primary (2) constraints = '[+dc=dc2]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc2]', lease_preferences = '[]' -test t4 p1_b p1 y t4@primary (3) constraints = '[+dc=dc3]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t4 p1_b p1 y t4@primary (3) constraints = '[+dc=dc3]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc3]', lease_preferences = '[]' -test t4 p2 NULL x t4@primary (4) constraints = '[+dc=dc4]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t4 p2 NULL x t4@primary (4) constraints = '[+dc=dc4]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc4]', lease_preferences = '[]' -test t4 p2_a p2 y t4@primary (5) constraints = '[+dc=dc5]' range_min_bytes = 16777216, -range_max_bytes = 67108864, +test t4 p2_a p2 y t4@primary (5) constraints = '[+dc=dc5]' range_min_bytes = 17179869184, +range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[+dc=dc5]', diff --git a/pkg/ccl/logictestccl/testdata/logic_test/partitioning b/pkg/ccl/logictestccl/testdata/logic_test/partitioning index 7e9582cf9317..f657f6927d30 100644 --- a/pkg/ccl/logictestccl/testdata/logic_test/partitioning +++ b/pkg/ccl/logictestccl/testdata/logic_test/partitioning @@ -949,32 +949,32 @@ CREATE TABLE d_show_partitions.t (x INT PRIMARY KEY) PARTITION BY LIST (x) ( PAR query TTTTTTTTT SHOW PARTITIONS FROM DATABASE d_show_partitions ---- -d_show_partitions t p1 NULL x t@primary (1) NULL range_min_bytes = 16777216, - range_max_bytes = 67108864, - gc.ttlseconds = 90000, - num_replicas = 3, - constraints = '[]', - lease_preferences = '[]' +d_show_partitions t p1 NULL x t@primary (1) NULL range_min_bytes = 17179869184, +range_max_bytes = 34359738368, +gc.ttlseconds = 90000, +num_replicas = 3, +constraints = '[]', +lease_preferences = '[]' query TTTTTTTTT SHOW PARTITIONS FROM TABLE d_show_partitions.t ---- -d_show_partitions t p1 NULL x t@primary (1) NULL range_min_bytes = 16777216, - range_max_bytes = 67108864, - gc.ttlseconds = 90000, - num_replicas = 3, - constraints = '[]', - lease_preferences = '[]' +d_show_partitions t p1 NULL x t@primary (1) NULL range_min_bytes = 17179869184, +range_max_bytes = 34359738368, +gc.ttlseconds = 90000, +num_replicas = 3, +constraints = '[]', +lease_preferences = '[]' query TTTTTTTTT SHOW PARTITIONS FROM INDEX d_show_partitions.t@primary ---- -d_show_partitions t p1 NULL x t@primary (1) NULL range_min_bytes = 16777216, - range_max_bytes = 67108864, - gc.ttlseconds = 90000, - num_replicas = 3, - constraints = '[]', - lease_preferences = '[]' +d_show_partitions t p1 NULL x t@primary (1) NULL range_min_bytes = 17179869184, +range_max_bytes = 34359738368, +gc.ttlseconds = 90000, +num_replicas = 3, +constraints = '[]', +lease_preferences = '[]' statement ok CREATE DATABASE "show partitions" @@ -985,32 +985,32 @@ CREATE TABLE "show partitions".t (x INT PRIMARY KEY) PARTITION BY LIST (x) ( PAR query TTTTTTTTT SHOW PARTITIONS FROM DATABASE "show partitions" ---- -show partitions t p1 NULL x t@primary (1) NULL range_min_bytes = 16777216, - range_max_bytes = 67108864, - gc.ttlseconds = 90000, - num_replicas = 3, - constraints = '[]', - lease_preferences = '[]' +show partitions t p1 NULL x t@primary (1) NULL range_min_bytes = 17179869184, +range_max_bytes = 34359738368, +gc.ttlseconds = 90000, +num_replicas = 3, +constraints = '[]', +lease_preferences = '[]' query TTTTTTTTT SHOW PARTITIONS FROM TABLE "show partitions".t ---- -show partitions t p1 NULL x t@primary (1) NULL range_min_bytes = 16777216, - range_max_bytes = 67108864, - gc.ttlseconds = 90000, - num_replicas = 3, - constraints = '[]', - lease_preferences = '[]' +show partitions t p1 NULL x t@primary (1) NULL range_min_bytes = 17179869184, +range_max_bytes = 34359738368, +gc.ttlseconds = 90000, +num_replicas = 3, +constraints = '[]', +lease_preferences = '[]' query TTTTTTTTT SHOW PARTITIONS FROM INDEX "show partitions".t@primary ---- -show partitions t p1 NULL x t@primary (1) NULL range_min_bytes = 16777216, - range_max_bytes = 67108864, - gc.ttlseconds = 90000, - num_replicas = 3, - constraints = '[]', - lease_preferences = '[]' +show partitions t p1 NULL x t@primary (1) NULL range_min_bytes = 17179869184, +range_max_bytes = 34359738368, +gc.ttlseconds = 90000, +num_replicas = 3, +constraints = '[]', +lease_preferences = '[]' statement ok CREATE DATABASE """" @@ -1021,32 +1021,32 @@ CREATE TABLE """".t (x INT PRIMARY KEY) PARTITION BY LIST (x) ( PARTITION p1 VAL query TTTTTTTTT SHOW PARTITIONS FROM DATABASE """" ---- -" t p1 NULL x t@primary (1) NULL range_min_bytes = 16777216, - range_max_bytes = 67108864, - gc.ttlseconds = 90000, - num_replicas = 3, - constraints = '[]', - lease_preferences = '[]' +" t p1 NULL x t@primary (1) NULL range_min_bytes = 17179869184, +range_max_bytes = 34359738368, +gc.ttlseconds = 90000, +num_replicas = 3, +constraints = '[]', +lease_preferences = '[]' query TTTTTTTTT SHOW PARTITIONS FROM TABLE """".t ---- -" t p1 NULL x t@primary (1) NULL range_min_bytes = 16777216, - range_max_bytes = 67108864, - gc.ttlseconds = 90000, - num_replicas = 3, - constraints = '[]', - lease_preferences = '[]' +" t p1 NULL x t@primary (1) NULL range_min_bytes = 17179869184, +range_max_bytes = 34359738368, +gc.ttlseconds = 90000, +num_replicas = 3, +constraints = '[]', +lease_preferences = '[]' query TTTTTTTTT SHOW PARTITIONS FROM INDEX """".t@primary ---- -" t p1 NULL x t@primary (1) NULL range_min_bytes = 16777216, - range_max_bytes = 67108864, - gc.ttlseconds = 90000, - num_replicas = 3, - constraints = '[]', - lease_preferences = '[]' +" t p1 NULL x t@primary (1) NULL range_min_bytes = 17179869184, +range_max_bytes = 34359738368, +gc.ttlseconds = 90000, +num_replicas = 3, +constraints = '[]', +lease_preferences = '[]' query T SELECT feature_name FROM crdb_internal.feature_usage WHERE feature_name='sql.show.partitions' AND usage_count > 0 @@ -1063,12 +1063,12 @@ ALTER TABLE t_inherit PARTITION BY LIST (x) ( PARTITION p1 VALUES IN (1) ) query TTTTTTTTT SHOW PARTITIONS FROM TABLE t_inherit ---- -test t_inherit p1 NULL x t_inherit@primary (1) NULL range_min_bytes = 16777216, - range_max_bytes = 67108864, - gc.ttlseconds = 90000, - num_replicas = 3, - constraints = '[]', - lease_preferences = '[]' +test t_inherit p1 NULL x t_inherit@primary (1) NULL range_min_bytes = 17179869184, +range_max_bytes = 34359738368, +gc.ttlseconds = 90000, +num_replicas = 3, +constraints = '[]', +lease_preferences = '[]' statement ok ALTER PARTITION p1 of TABLE t_inherit CONFIGURE ZONE USING num_replicas=5 @@ -1076,12 +1076,12 @@ ALTER PARTITION p1 of TABLE t_inherit CONFIGURE ZONE USING num_replicas=5 query TTTTTTTTT SHOW PARTITIONS FROM TABLE t_inherit ---- -test t_inherit p1 NULL x t_inherit@primary (1) num_replicas = 5 range_min_bytes = 16777216, - range_max_bytes = 67108864, - gc.ttlseconds = 90000, - num_replicas = 5, - constraints = '[]', - lease_preferences = '[]' +test t_inherit p1 NULL x t_inherit@primary (1) num_replicas = 5 range_min_bytes = 17179869184, +range_max_bytes = 34359738368, +gc.ttlseconds = 90000, +num_replicas = 5, +constraints = '[]', +lease_preferences = '[]' statement ok CREATE TABLE t_inherit_range (x INT PRIMARY KEY) @@ -1092,12 +1092,12 @@ ALTER TABLE t_inherit_range PARTITION BY RANGE (x) ( PARTITION p1 VALUES FROM (1 query TTTTTTTTT SHOW PARTITIONS FROM TABLE t_inherit_range ---- -test t_inherit_range p1 NULL x t_inherit_range@primary (1) TO (2) NULL range_min_bytes = 16777216, - range_max_bytes = 67108864, - gc.ttlseconds = 90000, - num_replicas = 3, - constraints = '[]', - lease_preferences = '[]' +test t_inherit_range p1 NULL x t_inherit_range@primary (1) TO (2) NULL range_min_bytes = 17179869184, +range_max_bytes = 34359738368, +gc.ttlseconds = 90000, +num_replicas = 3, +constraints = '[]', +lease_preferences = '[]' statement ok ALTER PARTITION p1 of TABLE t_inherit_range CONFIGURE ZONE USING num_replicas=5 @@ -1105,9 +1105,9 @@ ALTER PARTITION p1 of TABLE t_inherit_range CONFIGURE ZONE USING num_replicas=5 query TTTTTTTTT SHOW PARTITIONS FROM TABLE t_inherit_range ---- -test t_inherit_range p1 NULL x t_inherit_range@primary (1) TO (2) num_replicas = 5 range_min_bytes = 16777216, - range_max_bytes = 67108864, - gc.ttlseconds = 90000, - num_replicas = 5, - constraints = '[]', - lease_preferences = '[]' +test t_inherit_range p1 NULL x t_inherit_range@primary (1) TO (2) num_replicas = 5 range_min_bytes = 17179869184, +range_max_bytes = 34359738368, +gc.ttlseconds = 90000, +num_replicas = 5, +constraints = '[]', +lease_preferences = '[]' diff --git a/pkg/ccl/logictestccl/testdata/logic_test/zone b/pkg/ccl/logictestccl/testdata/logic_test/zone index e82b0724dba9..631fcf9a3892 100644 --- a/pkg/ccl/logictestccl/testdata/logic_test/zone +++ b/pkg/ccl/logictestccl/testdata/logic_test/zone @@ -482,8 +482,8 @@ query TT SHOW ZONE CONFIGURATION FOR PARTITION x1 OF TABLE t35756 ---- RANGE default ALTER RANGE default CONFIGURE ZONE USING - range_min_bytes = 16777216, - range_max_bytes = 67108864, + range_min_bytes = 17179869184, + range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[]', @@ -512,8 +512,8 @@ query TT SHOW ZONE CONFIGURATION FOR PARTITION x1_idx OF INDEX t38391@foo ---- PARTITION x1_idx OF INDEX t38391@foo ALTER PARTITION x1_idx OF INDEX t38391@foo CONFIGURE ZONE USING - range_min_bytes = 16777216, - range_max_bytes = 67108864, + range_min_bytes = 17179869184, + range_max_bytes = 34359738368, gc.ttlseconds = 31337, num_replicas = 3, constraints = '[]', @@ -863,20 +863,20 @@ query TTT SELECT table_name, index_name, full_config_sql FROM crdb_internal.zones WHERE table_name='t38074' ---- -t38074 NULL ALTER TABLE test.public.t38074 CONFIGURE ZONE USING - range_min_bytes = 16777216, - range_max_bytes = 67108864, - gc.ttlseconds = 70000, - num_replicas = 3, - constraints = '[]', - lease_preferences = '[]' -t38074 i ALTER INDEX test.public.t38074@i CONFIGURE ZONE USING - range_min_bytes = 16777216, - range_max_bytes = 67108864, - gc.ttlseconds = 80000, - num_replicas = 3, - constraints = '[]', - lease_preferences = '[]' +t38074 NULL ALTER TABLE test.public.t38074 CONFIGURE ZONE USING + range_min_bytes = 17179869184, + range_max_bytes = 34359738368, + gc.ttlseconds = 70000, + num_replicas = 3, + constraints = '[]', + lease_preferences = '[]' +t38074 i ALTER INDEX test.public.t38074@i CONFIGURE ZONE USING + range_min_bytes = 17179869184, + range_max_bytes = 34359738368, + gc.ttlseconds = 80000, + num_replicas = 3, + constraints = '[]', + lease_preferences = '[]' # Regression test for #39994: verify that certain fields have to be set in tandem in indexes and partitions. statement ok diff --git a/pkg/config/zonepb/zone.go b/pkg/config/zonepb/zone.go index d0e95076afc3..465a08754c3d 100644 --- a/pkg/config/zonepb/zone.go +++ b/pkg/config/zonepb/zone.go @@ -189,8 +189,8 @@ func EmptyCompleteZoneConfig() *ZoneConfig { func DefaultZoneConfig() ZoneConfig { return ZoneConfig{ NumReplicas: proto.Int32(3), - RangeMinBytes: proto.Int64(16 << 20), // 16 MB - RangeMaxBytes: proto.Int64(64 << 20), // 64 MB + RangeMinBytes: proto.Int64(16 << 30), // 16 GB + RangeMaxBytes: proto.Int64(32 << 30), // 32 MB GC: &GCPolicy{ // Use 25 hours instead of the previous 24 to make users successful by // default. Users desiring to take incremental backups every 24h may @@ -217,8 +217,8 @@ func DefaultZoneConfigRef() *ZoneConfig { func DefaultSystemZoneConfig() ZoneConfig { return ZoneConfig{ NumReplicas: proto.Int32(5), - RangeMinBytes: proto.Int64(16 << 20), // 16 MB - RangeMaxBytes: proto.Int64(64 << 20), // 64 MB + RangeMinBytes: proto.Int64(16 << 30), // 16 GB + RangeMaxBytes: proto.Int64(32 << 30), // 32 GB GC: &GCPolicy{ // Use 25 hours instead of the previous 24 to make users successful by // default. Users desiring to take incremental backups every 24h may diff --git a/pkg/sql/logictest/testdata/logic_test/alter_table b/pkg/sql/logictest/testdata/logic_test/alter_table index ef063959bc2a..b870ca73caa5 100644 --- a/pkg/sql/logictest/testdata/logic_test/alter_table +++ b/pkg/sql/logictest/testdata/logic_test/alter_table @@ -1058,4 +1058,3 @@ ALTER TABLE t43092 ALTER COLUMN x DROP NOT NULL statement ok DROP TABLE t43092 - diff --git a/pkg/sql/logictest/testdata/logic_test/crdb_internal b/pkg/sql/logictest/testdata/logic_test/crdb_internal index 63a77641153f..0428dc5f82e3 100644 --- a/pkg/sql/logictest/testdata/logic_test/crdb_internal +++ b/pkg/sql/logictest/testdata/logic_test/crdb_internal @@ -242,14 +242,14 @@ SELECT zone_id, target FROM crdb_internal.zones ORDER BY 1 query T SELECT quote_literal(raw_config_yaml) FROM crdb_internal.zones WHERE zone_id = 0 ---- -e'range_min_bytes: 16777216\nrange_max_bytes: 67108864\ngc:\n ttlseconds: 90000\nnum_replicas: 3\nconstraints: []\nlease_preferences: []\n' +e'range_min_bytes: 17179869184\nrange_max_bytes: 34359738368\ngc:\n ttlseconds: 90000\nnum_replicas: 3\nconstraints: []\nlease_preferences: []\n' query T SELECT raw_config_sql FROM crdb_internal.zones WHERE zone_id = 0 ---- ALTER RANGE default CONFIGURE ZONE USING - range_min_bytes = 16777216, - range_max_bytes = 67108864, + range_min_bytes = 17179869184, + range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[]', diff --git a/pkg/sql/logictest/testdata/logic_test/create_statements b/pkg/sql/logictest/testdata/logic_test/create_statements index 370a3470a3dc..5bbf90431793 100644 --- a/pkg/sql/logictest/testdata/logic_test/create_statements +++ b/pkg/sql/logictest/testdata/logic_test/create_statements @@ -88,4 +88,3 @@ CREATE TABLE a (b INT) WITH (toast_tuple_target=100); statement ok CREATE TABLE a (b INT) WITH (fillfactor=100); - diff --git a/pkg/sql/logictest/testdata/logic_test/show_create b/pkg/sql/logictest/testdata/logic_test/show_create index ab85daf8bd4d..c23eab2c76c2 100644 --- a/pkg/sql/logictest/testdata/logic_test/show_create +++ b/pkg/sql/logictest/testdata/logic_test/show_create @@ -30,4 +30,3 @@ c CREATE TABLE c ( COMMENT ON TABLE c IS 'table'; COMMENT ON COLUMN c.a IS 'column'; COMMENT ON INDEX c_a_b_idx IS 'index' - diff --git a/pkg/sql/logictest/testdata/logic_test/zone_config b/pkg/sql/logictest/testdata/logic_test/zone_config index c1295055a059..1acb523e8bd7 100644 --- a/pkg/sql/logictest/testdata/logic_test/zone_config +++ b/pkg/sql/logictest/testdata/logic_test/zone_config @@ -7,8 +7,8 @@ query IT SELECT zone_id, raw_config_sql FROM [SHOW ZONE CONFIGURATION FOR RANGE default] ---- 0 ALTER RANGE default CONFIGURE ZONE USING - range_min_bytes = 16777216, - range_max_bytes = 67108864, + range_min_bytes = 17179869184, + range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 1, constraints = '[]', @@ -23,8 +23,8 @@ query IT SELECT zone_id, raw_config_sql FROM [SHOW ZONE CONFIGURATION FOR RANGE default] ---- 0 ALTER RANGE default CONFIGURE ZONE USING - range_min_bytes = 16777216, - range_max_bytes = 67108864, + range_min_bytes = 17179869184, + range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[]', @@ -45,7 +45,7 @@ SELECT zone_id, raw_config_sql FROM [SHOW ZONE CONFIGURATION FOR TABLE a] ---- 0 ALTER RANGE default CONFIGURE ZONE USING range_min_bytes = 1234567, - range_max_bytes = 67108864, + range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[]', @@ -62,7 +62,7 @@ SELECT zone_id, raw_config_sql FROM [SHOW ZONE CONFIGURATION FOR TABLE a] ---- 53 ALTER TABLE a CONFIGURE ZONE USING range_min_bytes = 1234567, - range_max_bytes = 67108864, + range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[]', @@ -133,7 +133,7 @@ SELECT zone_id, raw_config_sql FROM [SHOW ZONE CONFIGURATION FOR TABLE a] ---- 53 ALTER TABLE a CONFIGURE ZONE USING range_min_bytes = 1234567, - range_max_bytes = 67108864, + range_max_bytes = 34359738368, gc.ttlseconds = 90000, num_replicas = 3, constraints = '[]', From 8e9a7f8ab8db3beabc9adc170dad6fefb1fb7ae6 Mon Sep 17 00:00:00 2001 From: Andrew Werner Date: Tue, 11 Feb 2020 14:44:57 -0500 Subject: [PATCH 2/2] workload: only disable the merge queue for v19.1 and before in Split Before 19.2 we needed to disable the merge queue in order to issue splits. There's no good reason to disable it in later versions. Doing so may be masking problems Release note: None --- pkg/workload/workloadsql/workloadsql.go | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkg/workload/workloadsql/workloadsql.go b/pkg/workload/workloadsql/workloadsql.go index 8b033411ebfe..7d015f0c58ea 100644 --- a/pkg/workload/workloadsql/workloadsql.go +++ b/pkg/workload/workloadsql/workloadsql.go @@ -22,6 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/lex" "github.com/cockroachdb/cockroach/pkg/util/ctxgroup" "github.com/cockroachdb/cockroach/pkg/util/log" + "github.com/cockroachdb/cockroach/pkg/util/version" "github.com/cockroachdb/cockroach/pkg/workload" "github.com/pkg/errors" "golang.org/x/time/rate" @@ -60,6 +61,8 @@ func Setup( return bytes, nil } +// maybeDisableMergeQueue disables the merge queue for versions prior to +// 19.2. func maybeDisableMergeQueue(db *gosql.DB) error { var ok bool if err := db.QueryRow( @@ -67,7 +70,20 @@ func maybeDisableMergeQueue(db *gosql.DB) error { ).Scan(&ok); err != nil || !ok { return err } - _, err := db.Exec("SET CLUSTER SETTING kv.range_merge.queue_enabled = false") + var versionStr string + err := db.QueryRow( + `SELECT value FROM crdb_internal.node_build_info WHERE field = 'Version'`, + ).Scan(&versionStr) + if err != nil { + return err + } + v, err := version.Parse(versionStr) + // If we can't parse the error then we'll assume that we should disable the + // queue. This happens in testing. + if err == nil && (v.Major() > 19 || (v.Major() == 19 && v.Minor() >= 2)) { + return nil + } + _, err = db.Exec("SET CLUSTER SETTING kv.range_merge.queue_enabled = false") return err }