diff --git a/.circleci/config.yml b/.circleci/config.yml index d269739f2..a1c0f1553 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ orbs: parameters: image_suffix: type: string - default: '-v0c8d80c' + default: '-v641cdcd' pg14_version: type: string default: '14.9' @@ -15,10 +15,10 @@ parameters: default: '15.4' pg16_version: type: string - default: '16beta3' + default: '16rc1' upgrade_pg_versions: type: string - default: '14.9-15.4-16beta3' + default: '14.9-15.4-16rc1' style_checker_tools_version: type: string default: '0.8.18' diff --git a/src/test/regress/expected/isolation_shard_rebalancer_progress.out b/src/test/regress/expected/isolation_shard_rebalancer_progress.out index 8553a1d4d..90c78ca62 100644 --- a/src/test/regress/expected/isolation_shard_rebalancer_progress.out +++ b/src/test/regress/expected/isolation_shard_rebalancer_progress.out @@ -19,7 +19,7 @@ step s1-rebalance-c1-block-writes: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -40,8 +40,8 @@ step s7-get-progress: table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname|targetport|target_shard_size|progress|operation_type|lsn_sanity_check|source_lsn_available|target_lsn_available|status --------------------------------------------------------------------- -colocated1|1500001| 50000|localhost | 57637| 50000|localhost | 57638| 8000| 1|move |t |t |f |Copying Data -colocated2|1500005| 400000|localhost | 57637| 400000|localhost | 57638| 8000| 1|move |t |t |f |Copying Data +colocated1|1500001| 40000|localhost | 57637| 40000|localhost | 57638| 8000| 1|move |t |t |f |Copying Data +colocated2|1500005| 480000|localhost | 57637| 480000|localhost | 57638| 8000| 1|move |t |t |f |Copying Data colocated1|1500002| 200000|localhost | 57637| 200000|localhost | 57638| 0| 0|move |t |t |f |Not Started Yet colocated2|1500006| 8000|localhost | 57637| 8000|localhost | 57638| 0| 0|move |t |t |f |Not Started Yet (4 rows) @@ -63,7 +63,7 @@ rebalance_table_shards step s1-wait: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -102,7 +102,7 @@ step s1-rebalance-c1-block-writes: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -123,8 +123,8 @@ step s7-get-progress: table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname|targetport|target_shard_size|progress|operation_type|lsn_sanity_check|source_lsn_available|target_lsn_available|status --------------------------------------------------------------------- -colocated1|1500001| 50000|localhost | 57637| 50000|localhost | 57638| 50000| 2|move |t |t |f |Completed -colocated2|1500005| 400000|localhost | 57637| 400000|localhost | 57638| 400000| 2|move |t |t |f |Completed +colocated1|1500001| 40000|localhost | 57637| 40000|localhost | 57638| 40000| 2|move |t |t |f |Completed +colocated2|1500005| 480000|localhost | 57637| 480000|localhost | 57638| 480000| 2|move |t |t |f |Completed colocated1|1500002| 200000|localhost | 57637| 200000|localhost | 57638| 0| 1|move |t |t |f |Setting Up colocated2|1500006| 8000|localhost | 57637| 8000|localhost | 57638| 0| 1|move |t |t |f |Setting Up (4 rows) @@ -141,7 +141,7 @@ rebalance_table_shards step s1-wait: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -184,7 +184,7 @@ step s1-rebalance-c1-block-writes: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -205,8 +205,8 @@ step s7-get-progress: table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname|targetport|target_shard_size|progress|operation_type|lsn_sanity_check|source_lsn_available|target_lsn_available|status --------------------------------------------------------------------- -colocated1|1500001| 50000|localhost | 57637| 50000|localhost | 57638| 50000| 1|move |t |t |f |Copying Data -colocated2|1500005| 400000|localhost | 57637| 400000|localhost | 57638| 400000| 1|move |t |t |f |Copying Data +colocated1|1500001| 40000|localhost | 57637| 40000|localhost | 57638| 40000| 1|move |t |t |f |Copying Data +colocated2|1500005| 480000|localhost | 57637| 480000|localhost | 57638| 480000| 1|move |t |t |f |Copying Data colocated1|1500002| 200000|localhost | 57637| 200000|localhost | 57638| 0| 0|move |t |t |f |Not Started Yet colocated2|1500006| 8000|localhost | 57637| 8000|localhost | 57638| 0| 0|move |t |t |f |Not Started Yet (4 rows) @@ -228,7 +228,7 @@ rebalance_table_shards step s1-wait: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -271,7 +271,7 @@ step s1-rebalance-c1-online: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -292,8 +292,8 @@ step s7-get-progress: table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname|targetport|target_shard_size|progress|operation_type|lsn_sanity_check|source_lsn_available|target_lsn_available|status --------------------------------------------------------------------- -colocated1|1500001| 50000|localhost | 57637| 50000|localhost | 57638| 8000| 1|move |t |t |f |Setting Up -colocated2|1500005| 400000|localhost | 57637| 400000|localhost | 57638| 8000| 1|move |t |t |f |Setting Up +colocated1|1500001| 40000|localhost | 57637| 40000|localhost | 57638| 8000| 1|move |t |t |f |Setting Up +colocated2|1500005| 480000|localhost | 57637| 480000|localhost | 57638| 8000| 1|move |t |t |f |Setting Up colocated1|1500002| 200000|localhost | 57637| 200000|localhost | 57638| 0| 0|move |t |t |f |Not Started Yet colocated2|1500006| 8000|localhost | 57637| 8000|localhost | 57638| 0| 0|move |t |t |f |Not Started Yet (4 rows) @@ -315,7 +315,7 @@ rebalance_table_shards step s1-wait: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -358,7 +358,7 @@ step s1-rebalance-c1-online: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -379,8 +379,8 @@ step s7-get-progress: table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname|targetport|target_shard_size|progress|operation_type|lsn_sanity_check|source_lsn_available|target_lsn_available|status --------------------------------------------------------------------- -colocated1|1500001| 50000|localhost | 57637| 50000|localhost | 57638| 50000| 1|move |t |t |t |Final Catchup -colocated2|1500005| 400000|localhost | 57637| 400000|localhost | 57638| 400000| 1|move |t |t |t |Final Catchup +colocated1|1500001| 40000|localhost | 57637| 40000|localhost | 57638| 40000| 1|move |t |t |t |Final Catchup +colocated2|1500005| 480000|localhost | 57637| 480000|localhost | 57638| 480000| 1|move |t |t |t |Final Catchup colocated1|1500002| 200000|localhost | 57637| 200000|localhost | 57638| 0| 0|move |t |t |f |Not Started Yet colocated2|1500006| 8000|localhost | 57637| 8000|localhost | 57638| 0| 0|move |t |t |f |Not Started Yet (4 rows) @@ -402,7 +402,7 @@ rebalance_table_shards step s1-wait: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -445,7 +445,7 @@ step s1-shard-move-c1-block-writes: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -466,8 +466,8 @@ step s7-get-progress: table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname|targetport|target_shard_size|progress|operation_type|lsn_sanity_check|source_lsn_available|target_lsn_available|status --------------------------------------------------------------------- -colocated1|1500001| 50000|localhost | 57637| 50000|localhost | 57638| 8000| 1|move |t |t |f |Copying Data -colocated2|1500005| 400000|localhost | 57637| 400000|localhost | 57638| 8000| 1|move |t |t |f |Copying Data +colocated1|1500001| 40000|localhost | 57637| 40000|localhost | 57638| 8000| 1|move |t |t |f |Copying Data +colocated2|1500005| 480000|localhost | 57637| 480000|localhost | 57638| 8000| 1|move |t |t |f |Copying Data (2 rows) step s5-release-advisory-lock: @@ -487,7 +487,7 @@ citus_move_shard_placement step s1-wait: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -530,7 +530,7 @@ step s1-shard-move-c1-block-writes: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -551,8 +551,8 @@ step s7-get-progress: table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname|targetport|target_shard_size|progress|operation_type|lsn_sanity_check|source_lsn_available|target_lsn_available|status --------------------------------------------------------------------- -colocated1|1500001| 50000|localhost | 57637| 50000|localhost | 57638| 50000| 1|move |t |t |f |Copying Data -colocated2|1500005| 400000|localhost | 57637| 400000|localhost | 57638| 400000| 1|move |t |t |f |Copying Data +colocated1|1500001| 40000|localhost | 57637| 40000|localhost | 57638| 40000| 1|move |t |t |f |Copying Data +colocated2|1500005| 480000|localhost | 57637| 480000|localhost | 57638| 480000| 1|move |t |t |f |Copying Data (2 rows) step s6-release-advisory-lock: @@ -572,7 +572,7 @@ citus_move_shard_placement step s1-wait: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -616,7 +616,7 @@ step s1-shard-copy-c1-block-writes: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -637,8 +637,8 @@ step s7-get-progress: table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname|targetport|target_shard_size|progress|operation_type|lsn_sanity_check|source_lsn_available|target_lsn_available|status --------------------------------------------------------------------- -colocated1|1500001| 50000|localhost | 57637| 50000|localhost | 57638| 8000| 1|copy |t |t |f |Copying Data -colocated2|1500005| 400000|localhost | 57637| 400000|localhost | 57638| 8000| 1|copy |t |t |f |Copying Data +colocated1|1500001| 40000|localhost | 57637| 40000|localhost | 57638| 8000| 1|copy |t |t |f |Copying Data +colocated2|1500005| 480000|localhost | 57637| 480000|localhost | 57638| 8000| 1|copy |t |t |f |Copying Data (2 rows) step s5-release-advisory-lock: @@ -658,7 +658,7 @@ citus_copy_shard_placement step s1-wait: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -702,7 +702,7 @@ step s1-shard-copy-c1-block-writes: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -723,8 +723,8 @@ step s7-get-progress: table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname|targetport|target_shard_size|progress|operation_type|lsn_sanity_check|source_lsn_available|target_lsn_available|status --------------------------------------------------------------------- -colocated1|1500001| 50000|localhost | 57637| 50000|localhost | 57638| 50000| 1|copy |t |t |f |Copying Data -colocated2|1500005| 400000|localhost | 57637| 400000|localhost | 57638| 400000| 1|copy |t |t |f |Copying Data +colocated1|1500001| 40000|localhost | 57637| 40000|localhost | 57638| 40000| 1|copy |t |t |f |Copying Data +colocated2|1500005| 480000|localhost | 57637| 480000|localhost | 57638| 480000| 1|copy |t |t |f |Copying Data (2 rows) step s6-release-advisory-lock: @@ -744,7 +744,7 @@ citus_copy_shard_placement step s1-wait: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -787,7 +787,7 @@ step s1-shard-move-c1-online: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -808,8 +808,8 @@ step s7-get-progress: table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname|targetport|target_shard_size|progress|operation_type|lsn_sanity_check|source_lsn_available|target_lsn_available|status --------------------------------------------------------------------- -colocated1|1500001| 50000|localhost | 57637| 50000|localhost | 57638| 8000| 1|move |t |t |f |Setting Up -colocated2|1500005| 400000|localhost | 57637| 400000|localhost | 57638| 8000| 1|move |t |t |f |Setting Up +colocated1|1500001| 40000|localhost | 57637| 40000|localhost | 57638| 8000| 1|move |t |t |f |Setting Up +colocated2|1500005| 480000|localhost | 57637| 480000|localhost | 57638| 8000| 1|move |t |t |f |Setting Up (2 rows) step s5-release-advisory-lock: @@ -829,7 +829,7 @@ citus_move_shard_placement step s1-wait: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -872,7 +872,7 @@ step s1-shard-move-c1-online: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -893,8 +893,8 @@ step s7-get-progress: table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname|targetport|target_shard_size|progress|operation_type|lsn_sanity_check|source_lsn_available|target_lsn_available|status --------------------------------------------------------------------- -colocated1|1500001| 50000|localhost | 57637| 50000|localhost | 57638| 50000| 1|move |t |t |t |Final Catchup -colocated2|1500005| 400000|localhost | 57637| 400000|localhost | 57638| 400000| 1|move |t |t |t |Final Catchup +colocated1|1500001| 40000|localhost | 57637| 40000|localhost | 57638| 40000| 1|move |t |t |t |Final Catchup +colocated2|1500005| 480000|localhost | 57637| 480000|localhost | 57638| 480000| 1|move |t |t |t |Final Catchup (2 rows) step s6-release-advisory-lock: @@ -914,7 +914,7 @@ citus_move_shard_placement step s1-wait: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -958,7 +958,7 @@ step s1-shard-copy-c1-online: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -979,8 +979,8 @@ step s7-get-progress: table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname|targetport|target_shard_size|progress|operation_type|lsn_sanity_check|source_lsn_available|target_lsn_available|status --------------------------------------------------------------------- -colocated1|1500001| 50000|localhost | 57637| 50000|localhost | 57638| 8000| 1|copy |t |t |f |Setting Up -colocated2|1500005| 400000|localhost | 57637| 400000|localhost | 57638| 8000| 1|copy |t |t |f |Setting Up +colocated1|1500001| 40000|localhost | 57637| 40000|localhost | 57638| 8000| 1|copy |t |t |f |Setting Up +colocated2|1500005| 480000|localhost | 57637| 480000|localhost | 57638| 8000| 1|copy |t |t |f |Setting Up (2 rows) step s5-release-advisory-lock: @@ -1000,7 +1000,7 @@ citus_copy_shard_placement step s1-wait: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -1044,7 +1044,7 @@ step s1-shard-copy-c1-online: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -1065,8 +1065,8 @@ step s7-get-progress: table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname|targetport|target_shard_size|progress|operation_type|lsn_sanity_check|source_lsn_available|target_lsn_available|status --------------------------------------------------------------------- -colocated1|1500001| 50000|localhost | 57637| 50000|localhost | 57638| 50000| 1|copy |t |t |t |Final Catchup -colocated2|1500005| 400000|localhost | 57637| 400000|localhost | 57638| 400000| 1|copy |t |t |t |Final Catchup +colocated1|1500001| 40000|localhost | 57637| 40000|localhost | 57638| 40000| 1|copy |t |t |t |Final Catchup +colocated2|1500005| 480000|localhost | 57637| 480000|localhost | 57638| 480000| 1|copy |t |t |t |Final Catchup (2 rows) step s6-release-advisory-lock: @@ -1086,7 +1086,7 @@ citus_copy_shard_placement step s1-wait: step s7-get-progress: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -1132,7 +1132,7 @@ step s4-shard-move-sep-block-writes: step s7-get-progress-ordered: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -1153,9 +1153,9 @@ step s7-get-progress-ordered: table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname|targetport|target_shard_size|progress|operation_type|lsn_sanity_check|source_lsn_available|target_lsn_available --------------------------------------------------------------------- -colocated1|1500001| 50000|localhost | 57637| 50000|localhost | 57638| 8000| 1|move |t |t |f -colocated2|1500005| 400000|localhost | 57637| 400000|localhost | 57638| 8000| 1|move |t |t |f -separate |1500009| 50000|localhost | 57637| 50000|localhost | 57638| 8000| 1|move |t |t |f +colocated1|1500001| 40000|localhost | 57637| 40000|localhost | 57638| 8000| 1|move |t |t |f +colocated2|1500005| 480000|localhost | 57637| 480000|localhost | 57638| 8000| 1|move |t |t |f +separate |1500009| 200000|localhost | 57637| 200000|localhost | 57638| 8000| 1|move |t |t |f (3 rows) step s5-release-advisory-lock: @@ -1182,7 +1182,7 @@ step s1-wait: step s4-wait: step s7-get-progress-ordered: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -1228,7 +1228,7 @@ step s4-shard-move-sep-block-writes: step s7-get-progress-ordered: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -1249,9 +1249,9 @@ step s7-get-progress-ordered: table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname|targetport|target_shard_size|progress|operation_type|lsn_sanity_check|source_lsn_available|target_lsn_available --------------------------------------------------------------------- -colocated1|1500001| 50000|localhost | 57637| 50000|localhost | 57638| 50000| 1|move |t |t |f -colocated2|1500005| 400000|localhost | 57637| 400000|localhost | 57638| 400000| 1|move |t |t |f -separate |1500009| 50000|localhost | 57637| 50000|localhost | 57638| 200000| 1|move |t |t |f +colocated1|1500001| 40000|localhost | 57637| 40000|localhost | 57638| 40000| 1|move |t |t |f +colocated2|1500005| 480000|localhost | 57637| 480000|localhost | 57638| 480000| 1|move |t |t |f +separate |1500009| 200000|localhost | 57637| 200000|localhost | 57638| 200000| 1|move |t |t |f (3 rows) step s6-release-advisory-lock: @@ -1278,7 +1278,7 @@ step s1-wait: step s4-wait: step s7-get-progress-ordered: set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, diff --git a/src/test/regress/spec/isolation_shard_rebalancer_progress.spec b/src/test/regress/spec/isolation_shard_rebalancer_progress.spec index e329e9483..234703c21 100644 --- a/src/test/regress/spec/isolation_shard_rebalancer_progress.spec +++ b/src/test/regress/spec/isolation_shard_rebalancer_progress.spec @@ -131,7 +131,7 @@ session "s7" step "s7-get-progress" { set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid, @@ -157,7 +157,7 @@ step "s7-get-progress" step "s7-get-progress-ordered" { set LOCAL client_min_messages=NOTICE; - WITH possible_sizes(size) as (VALUES (0), (8000), (50000), (200000), (400000)) + WITH possible_sizes(size) as (VALUES (0), (8000), (40000), (200000), (480000)) SELECT table_name, shardid,