Skip to content

Commit

Permalink
config/zonepb: increase the default range size from 64/16 MB to 512/1…
Browse files Browse the repository at this point in the history
…28MB

This change increases the default range size by a factor of 8.
There has been a good bit of manual testing at a much larger
configuration of 64/16GB. At that configuration several issues
were observed and will continue to be worked through. At this size
no negative implications are anticipated.

Release note (general change): New clusters will have a larger default
range size which should enable greater storage density.
  • Loading branch information
ajwerner committed Feb 19, 2020
1 parent 64df8d8 commit 660b3e7
Show file tree
Hide file tree
Showing 8 changed files with 196 additions and 197 deletions.
28 changes: 14 additions & 14 deletions pkg/ccl/logictestccl/testdata/logic_test/crdb_internal
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 134217728,
range_max_bytes = 536870912,
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 = 137438953472,
range_max_bytes = 549755813888,
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 = 137438953472,
range_max_bytes = 549755813888,
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 = 137438953472,
range_max_bytes = 549755813888,
gc.ttlseconds = 90000,
num_replicas = 5,
constraints = '[]',
Expand All @@ -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 = 134217728,
range_max_bytes = 536870912,
gc.ttlseconds = 90000,
num_replicas = 5,
constraints = '[]',
Expand All @@ -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 = 134217728,
range_max_bytes = 536870912,
gc.ttlseconds = 90000,
num_replicas = 7,
constraints = '[]',
Expand All @@ -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 = 134217728,
range_max_bytes = 536870912,
gc.ttlseconds = 90000,
num_replicas = 3,
constraints = '[]',
Expand Down
144 changes: 72 additions & 72 deletions pkg/ccl/logictestccl/testdata/logic_test/distsql_partitioning
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
gc.ttlseconds = 90000,
num_replicas = 3,
constraints = '[]',
Expand All @@ -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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
gc.ttlseconds = 90000,
num_replicas = 3,
constraints = '[+dc=dc3]',
Expand All @@ -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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
gc.ttlseconds = 90000,
num_replicas = 3,
constraints = '[+dc=dc3]',
Expand All @@ -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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
gc.ttlseconds = 90000,
num_replicas = 3,
constraints = '[+dc=dc3]',
Expand All @@ -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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
gc.ttlseconds = 90000,
num_replicas = 3,
constraints = '[+dc=dc2]',
Expand All @@ -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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
gc.ttlseconds = 90000,
num_replicas = 3,
constraints = '[+dc=dc2]',
Expand All @@ -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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
gc.ttlseconds = 90000,
num_replicas = 3,
constraints = '[+dc=dc2]',
Expand Down Expand Up @@ -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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
gc.ttlseconds = 90000,
num_replicas = 3,
constraints = '[+dc=dc4]',
Expand All @@ -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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
gc.ttlseconds = 90000,
num_replicas = 3,
constraints = '[+dc=dc4]',
Expand All @@ -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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
gc.ttlseconds = 90000,
num_replicas = 3,
constraints = '[+dc=dc4]',
Expand Down Expand Up @@ -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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
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 = 134217728,
range_max_bytes = 536870912,
gc.ttlseconds = 90000,
num_replicas = 3,
constraints = '[+dc=dc5]',
Expand Down
Loading

0 comments on commit 660b3e7

Please sign in to comment.