external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove rebalance plan

enable-progress-monitor-isolation-tests-again-flaky4
Jelte Fennema 2022-10-07 09:20:14 +02:00
parent 4d9116f68b
commit 2cf59fb14f
3 changed files with 52 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/distributed/sql/udfs/citus_isolation_test_session_is_blocked/11.1-1.sql generated
View File

@ -4,6 +4,7 @@ RETURNS boolean AS $$
mBlockedGlobalPid int8; mBlockedGlobalPid int8;
workerProcessId integer := current_setting('citus.isolation_test_session_remote_process_id'); workerProcessId integer := current_setting('citus.isolation_test_session_remote_process_id');
coordinatorProcessId integer := current_setting('citus.isolation_test_session_process_id'); coordinatorProcessId integer := current_setting('citus.isolation_test_session_process_id');
r record;
BEGIN BEGIN
IF pg_catalog.old_pg_isolation_test_session_is_blocked(pBlockedPid, pInterestingPids) THEN IF pg_catalog.old_pg_isolation_test_session_is_blocked(pBlockedPid, pInterestingPids) THEN
RETURN true; RETURN true;
@ -23,6 +24,11 @@ RETURNS boolean AS $$
FROM get_all_active_transactions() WHERE process_id = pBlockedPid; FROM get_all_active_transactions() WHERE process_id = pBlockedPid;
END IF; END IF;
FOR r IN select a1.query blocking_query, a2.query waiting_query from citus_internal_global_blocked_processes() p join pg_stat_activity a1 on p.blocking_pid = a1.pid join pg_stat_activity a2 on p.waiting_pid = a2.pid WHERE waiting_global_pid = mBlockedGlobalPid
LOOP
RAISE WARNING E'%\nBLOCKS\n%', r.blocking_query, r.waiting_query;
END LOOP;
RETURN EXISTS ( RETURN EXISTS (
SELECT 1 FROM citus_internal_global_blocked_processes() SELECT 1 FROM citus_internal_global_blocked_processes()
WHERE waiting_global_pid = mBlockedGlobalPid WHERE waiting_global_pid = mBlockedGlobalPid

150
src/test/regress/expected/isolation_shard_rebalancer_progress.out
View File

@ -1,6 +1,6 @@
Parsed test spec with 7 sessions Parsed test spec with 7 sessions
starting permutation: s2-lock-1-start s1-rebalance-c1-block-writes s7-get-progress s2-unlock-1-start s1-commit s7-get-progress starting permutation: s2-lock-1-start s1-rebalance-c1-block-writes s7-get-progress s2-unlock-1-start s1-wait s7-get-progress
master_set_node_property master_set_node_property
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -12,8 +12,6 @@ step s2-lock-1-start:
DELETE FROM separate WHERE test_id = 1; DELETE FROM separate WHERE test_id = 1;
step s1-rebalance-c1-block-writes: step s1-rebalance-c1-block-writes:
BEGIN;
SELECT * FROM get_rebalance_table_shards_plan('colocated1');
SELECT rebalance_table_shards('colocated1', shard_transfer_mode:='block_writes'); SELECT rebalance_table_shards('colocated1', shard_transfer_mode:='block_writes');
<waiting ...> <waiting ...>
step s7-get-progress: step s7-get-progress:
@ -48,22 +46,12 @@ step s2-unlock-1-start:
ROLLBACK; ROLLBACK;
step s1-rebalance-c1-block-writes: <... completed> step s1-rebalance-c1-block-writes: <... completed>
table_name|shardid|shard_size|sourcename|sourceport|targetname|targetport
---------------------------------------------------------------------
colocated1|1500001| 0|localhost | 57637|localhost | 57638
colocated2|1500005| 0|localhost | 57637|localhost | 57638
colocated1|1500002| 0|localhost | 57637|localhost | 57638
colocated2|1500006| 0|localhost | 57637|localhost | 57638
(4 rows)
rebalance_table_shards rebalance_table_shards
--------------------------------------------------------------------- ---------------------------------------------------------------------
(1 row) (1 row)
step s1-commit: step s1-wait:
COMMIT;
step s7-get-progress: step s7-get-progress:
set LOCAL client_min_messages=NOTICE; 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), (50000), (200000), (400000))
@ -89,7 +77,7 @@ table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname
(0 rows) (0 rows)
starting permutation: s3-lock-2-start s1-rebalance-c1-block-writes s7-get-progress s3-unlock-2-start s1-commit s7-get-progress starting permutation: s3-lock-2-start s1-rebalance-c1-block-writes s7-get-progress s3-unlock-2-start s1-wait s7-get-progress
master_set_node_property master_set_node_property
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -100,8 +88,6 @@ step s3-lock-2-start:
DELETE FROM colocated1 WHERE test_id = 3; DELETE FROM colocated1 WHERE test_id = 3;
step s1-rebalance-c1-block-writes: step s1-rebalance-c1-block-writes:
BEGIN;
SELECT * FROM get_rebalance_table_shards_plan('colocated1');
SELECT rebalance_table_shards('colocated1', shard_transfer_mode:='block_writes'); SELECT rebalance_table_shards('colocated1', shard_transfer_mode:='block_writes');
<waiting ...> <waiting ...>
step s7-get-progress: step s7-get-progress:
@ -136,22 +122,12 @@ step s3-unlock-2-start:
ROLLBACK; ROLLBACK;
step s1-rebalance-c1-block-writes: <... completed> step s1-rebalance-c1-block-writes: <... completed>
table_name|shardid|shard_size|sourcename|sourceport|targetname|targetport
---------------------------------------------------------------------
colocated1|1500001| 0|localhost | 57637|localhost | 57638
colocated2|1500005| 0|localhost | 57637|localhost | 57638
colocated1|1500002| 0|localhost | 57637|localhost | 57638
colocated2|1500006| 0|localhost | 57637|localhost | 57638
(4 rows)
rebalance_table_shards rebalance_table_shards
--------------------------------------------------------------------- ---------------------------------------------------------------------
(1 row) (1 row)
step s1-commit: step s1-wait:
COMMIT;
step s7-get-progress: step s7-get-progress:
set LOCAL client_min_messages=NOTICE; 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), (50000), (200000), (400000))
@ -177,7 +153,7 @@ table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname
(0 rows) (0 rows)
starting permutation: s6-acquire-advisory-lock s1-rebalance-c1-block-writes s7-get-progress s6-release-advisory-lock s1-commit s7-get-progress starting permutation: s6-acquire-advisory-lock s1-rebalance-c1-block-writes s7-get-progress s6-release-advisory-lock s1-wait s7-get-progress
master_set_node_property master_set_node_property
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -192,8 +168,6 @@ pg_advisory_lock
(1 row) (1 row)
step s1-rebalance-c1-block-writes: step s1-rebalance-c1-block-writes:
BEGIN;
SELECT * FROM get_rebalance_table_shards_plan('colocated1');
SELECT rebalance_table_shards('colocated1', shard_transfer_mode:='block_writes'); SELECT rebalance_table_shards('colocated1', shard_transfer_mode:='block_writes');
<waiting ...> <waiting ...>
step s7-get-progress: step s7-get-progress:
@ -233,22 +207,12 @@ t
(1 row) (1 row)
step s1-rebalance-c1-block-writes: <... completed> step s1-rebalance-c1-block-writes: <... completed>
table_name|shardid|shard_size|sourcename|sourceport|targetname|targetport
---------------------------------------------------------------------
colocated1|1500001| 0|localhost | 57637|localhost | 57638
colocated2|1500005| 0|localhost | 57637|localhost | 57638
colocated1|1500002| 0|localhost | 57637|localhost | 57638
colocated2|1500006| 0|localhost | 57637|localhost | 57638
(4 rows)
rebalance_table_shards rebalance_table_shards
--------------------------------------------------------------------- ---------------------------------------------------------------------
(1 row) (1 row)
step s1-commit: step s1-wait:
COMMIT;
step s7-get-progress: step s7-get-progress:
set LOCAL client_min_messages=NOTICE; 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), (50000), (200000), (400000))
@ -274,7 +238,7 @@ table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname
(0 rows) (0 rows)
starting permutation: s5-acquire-advisory-lock s1-rebalance-c1-online s7-get-progress s5-release-advisory-lock s1-commit s7-get-progress starting permutation: s5-acquire-advisory-lock s1-rebalance-c1-online s7-get-progress s5-release-advisory-lock s1-wait s7-get-progress
master_set_node_property master_set_node_property
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -289,8 +253,6 @@ pg_advisory_lock
(1 row) (1 row)
step s1-rebalance-c1-online: step s1-rebalance-c1-online:
BEGIN;
SELECT * FROM get_rebalance_table_shards_plan('colocated1');
SELECT rebalance_table_shards('colocated1', shard_transfer_mode:='force_logical'); SELECT rebalance_table_shards('colocated1', shard_transfer_mode:='force_logical');
<waiting ...> <waiting ...>
step s7-get-progress: step s7-get-progress:
@ -330,22 +292,12 @@ t
(1 row) (1 row)
step s1-rebalance-c1-online: <... completed> step s1-rebalance-c1-online: <... completed>
table_name|shardid|shard_size|sourcename|sourceport|targetname|targetport
---------------------------------------------------------------------
colocated1|1500001| 0|localhost | 57637|localhost | 57638
colocated2|1500005| 0|localhost | 57637|localhost | 57638
colocated1|1500002| 0|localhost | 57637|localhost | 57638
colocated2|1500006| 0|localhost | 57637|localhost | 57638
(4 rows)
rebalance_table_shards rebalance_table_shards
--------------------------------------------------------------------- ---------------------------------------------------------------------
(1 row) (1 row)
step s1-commit: step s1-wait:
COMMIT;
step s7-get-progress: step s7-get-progress:
set LOCAL client_min_messages=NOTICE; 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), (50000), (200000), (400000))
@ -371,7 +323,7 @@ table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname
(0 rows) (0 rows)
starting permutation: s6-acquire-advisory-lock s1-rebalance-c1-online s7-get-progress s6-release-advisory-lock s1-commit s7-get-progress starting permutation: s6-acquire-advisory-lock s1-rebalance-c1-online s7-get-progress s6-release-advisory-lock s1-wait s7-get-progress
master_set_node_property master_set_node_property
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -386,8 +338,6 @@ pg_advisory_lock
(1 row) (1 row)
step s1-rebalance-c1-online: step s1-rebalance-c1-online:
BEGIN;
SELECT * FROM get_rebalance_table_shards_plan('colocated1');
SELECT rebalance_table_shards('colocated1', shard_transfer_mode:='force_logical'); SELECT rebalance_table_shards('colocated1', shard_transfer_mode:='force_logical');
<waiting ...> <waiting ...>
step s7-get-progress: step s7-get-progress:
@ -427,22 +377,12 @@ t
(1 row) (1 row)
step s1-rebalance-c1-online: <... completed> step s1-rebalance-c1-online: <... completed>
table_name|shardid|shard_size|sourcename|sourceport|targetname|targetport
---------------------------------------------------------------------
colocated1|1500001| 0|localhost | 57637|localhost | 57638
colocated2|1500005| 0|localhost | 57637|localhost | 57638
colocated1|1500002| 0|localhost | 57637|localhost | 57638
colocated2|1500006| 0|localhost | 57637|localhost | 57638
(4 rows)
rebalance_table_shards rebalance_table_shards
--------------------------------------------------------------------- ---------------------------------------------------------------------
(1 row) (1 row)
step s1-commit: step s1-wait:
COMMIT;
step s7-get-progress: step s7-get-progress:
set LOCAL client_min_messages=NOTICE; 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), (50000), (200000), (400000))
@ -468,7 +408,7 @@ table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname
(0 rows) (0 rows)
starting permutation: s2-lock-1-start s1-shard-move-c1-block-writes s7-get-progress s2-unlock-1-start s1-commit s7-get-progress starting permutation: s2-lock-1-start s1-shard-move-c1-block-writes s7-get-progress s2-unlock-1-start s1-wait s7-get-progress
master_set_node_property master_set_node_property
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -480,7 +420,6 @@ step s2-lock-1-start:
DELETE FROM separate WHERE test_id = 1; DELETE FROM separate WHERE test_id = 1;
step s1-shard-move-c1-block-writes: step s1-shard-move-c1-block-writes:
BEGIN;
SELECT citus_move_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, shard_transfer_mode:='block_writes'); SELECT citus_move_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, shard_transfer_mode:='block_writes');
<waiting ...> <waiting ...>
step s7-get-progress: step s7-get-progress:
@ -518,9 +457,7 @@ citus_move_shard_placement
(1 row) (1 row)
step s1-commit: step s1-wait:
COMMIT;
step s7-get-progress: step s7-get-progress:
set LOCAL client_min_messages=NOTICE; 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), (50000), (200000), (400000))
@ -546,7 +483,7 @@ table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname
(0 rows) (0 rows)
starting permutation: s6-acquire-advisory-lock s1-shard-move-c1-block-writes s7-get-progress s6-release-advisory-lock s1-commit s7-get-progress starting permutation: s6-acquire-advisory-lock s1-shard-move-c1-block-writes s7-get-progress s6-release-advisory-lock s1-wait s7-get-progress
master_set_node_property master_set_node_property
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -561,7 +498,6 @@ pg_advisory_lock
(1 row) (1 row)
step s1-shard-move-c1-block-writes: step s1-shard-move-c1-block-writes:
BEGIN;
SELECT citus_move_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, shard_transfer_mode:='block_writes'); SELECT citus_move_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, shard_transfer_mode:='block_writes');
<waiting ...> <waiting ...>
step s7-get-progress: step s7-get-progress:
@ -604,9 +540,7 @@ citus_move_shard_placement
(1 row) (1 row)
step s1-commit: step s1-wait:
COMMIT;
step s7-get-progress: step s7-get-progress:
set LOCAL client_min_messages=NOTICE; 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), (50000), (200000), (400000))
@ -632,7 +566,7 @@ table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname
(0 rows) (0 rows)
starting permutation: s2-lock-1-start s1-shard-copy-c1-block-writes s7-get-progress s2-unlock-1-start s1-commit starting permutation: s2-lock-1-start s1-shard-copy-c1-block-writes s7-get-progress s2-unlock-1-start s1-wait
master_set_node_property master_set_node_property
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -644,7 +578,6 @@ step s2-lock-1-start:
DELETE FROM separate WHERE test_id = 1; DELETE FROM separate WHERE test_id = 1;
step s1-shard-copy-c1-block-writes: step s1-shard-copy-c1-block-writes:
BEGIN;
UPDATE pg_dist_partition SET repmodel = 'c' WHERE logicalrelid IN ('colocated1', 'colocated2'); UPDATE pg_dist_partition SET repmodel = 'c' WHERE logicalrelid IN ('colocated1', 'colocated2');
SELECT citus_copy_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, transfer_mode:='block_writes'); SELECT citus_copy_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, transfer_mode:='block_writes');
<waiting ...> <waiting ...>
@ -683,11 +616,9 @@ citus_copy_shard_placement
(1 row) (1 row)
step s1-commit: step s1-wait:
COMMIT;
starting permutation: s6-acquire-advisory-lock s1-shard-copy-c1-block-writes s7-get-progress s6-release-advisory-lock s1-wait s7-get-progress
starting permutation: s6-acquire-advisory-lock s1-shard-copy-c1-block-writes s7-get-progress s6-release-advisory-lock s1-commit s7-get-progress
master_set_node_property master_set_node_property
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -702,7 +633,6 @@ pg_advisory_lock
(1 row) (1 row)
step s1-shard-copy-c1-block-writes: step s1-shard-copy-c1-block-writes:
BEGIN;
UPDATE pg_dist_partition SET repmodel = 'c' WHERE logicalrelid IN ('colocated1', 'colocated2'); UPDATE pg_dist_partition SET repmodel = 'c' WHERE logicalrelid IN ('colocated1', 'colocated2');
SELECT citus_copy_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, transfer_mode:='block_writes'); SELECT citus_copy_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, transfer_mode:='block_writes');
<waiting ...> <waiting ...>
@ -746,9 +676,7 @@ citus_copy_shard_placement
(1 row) (1 row)
step s1-commit: step s1-wait:
COMMIT;
step s7-get-progress: step s7-get-progress:
set LOCAL client_min_messages=NOTICE; 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), (50000), (200000), (400000))
@ -774,7 +702,7 @@ table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname
(0 rows) (0 rows)
starting permutation: s5-acquire-advisory-lock s1-shard-move-c1-online s7-get-progress s5-release-advisory-lock s1-commit s7-get-progress starting permutation: s5-acquire-advisory-lock s1-shard-move-c1-online s7-get-progress s5-release-advisory-lock s1-wait s7-get-progress
master_set_node_property master_set_node_property
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -789,7 +717,6 @@ pg_advisory_lock
(1 row) (1 row)
step s1-shard-move-c1-online: step s1-shard-move-c1-online:
BEGIN;
SELECT citus_move_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, shard_transfer_mode:='force_logical'); SELECT citus_move_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, shard_transfer_mode:='force_logical');
<waiting ...> <waiting ...>
step s7-get-progress: step s7-get-progress:
@ -832,9 +759,7 @@ citus_move_shard_placement
(1 row) (1 row)
step s1-commit: step s1-wait:
COMMIT;
step s7-get-progress: step s7-get-progress:
set LOCAL client_min_messages=NOTICE; 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), (50000), (200000), (400000))
@ -860,7 +785,7 @@ table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname
(0 rows) (0 rows)
starting permutation: s6-acquire-advisory-lock s1-shard-move-c1-online s7-get-progress s6-release-advisory-lock s1-commit s7-get-progress starting permutation: s6-acquire-advisory-lock s1-shard-move-c1-online s7-get-progress s6-release-advisory-lock s1-wait s7-get-progress
master_set_node_property master_set_node_property
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -875,7 +800,6 @@ pg_advisory_lock
(1 row) (1 row)
step s1-shard-move-c1-online: step s1-shard-move-c1-online:
BEGIN;
SELECT citus_move_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, shard_transfer_mode:='force_logical'); SELECT citus_move_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, shard_transfer_mode:='force_logical');
<waiting ...> <waiting ...>
step s7-get-progress: step s7-get-progress:
@ -918,9 +842,7 @@ citus_move_shard_placement
(1 row) (1 row)
step s1-commit: step s1-wait:
COMMIT;
step s7-get-progress: step s7-get-progress:
set LOCAL client_min_messages=NOTICE; 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), (50000), (200000), (400000))
@ -946,7 +868,7 @@ table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname
(0 rows) (0 rows)
starting permutation: s5-acquire-advisory-lock s1-shard-copy-c1-online s7-get-progress s5-release-advisory-lock s1-commit starting permutation: s5-acquire-advisory-lock s1-shard-copy-c1-online s7-get-progress s5-release-advisory-lock s1-wait
master_set_node_property master_set_node_property
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -961,7 +883,6 @@ pg_advisory_lock
(1 row) (1 row)
step s1-shard-copy-c1-online: step s1-shard-copy-c1-online:
BEGIN;
UPDATE pg_dist_partition SET repmodel = 'c' WHERE logicalrelid IN ('colocated1', 'colocated2'); UPDATE pg_dist_partition SET repmodel = 'c' WHERE logicalrelid IN ('colocated1', 'colocated2');
SELECT citus_copy_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, transfer_mode:='force_logical'); SELECT citus_copy_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, transfer_mode:='force_logical');
<waiting ...> <waiting ...>
@ -1005,11 +926,9 @@ citus_copy_shard_placement
(1 row) (1 row)
step s1-commit: step s1-wait:
COMMIT;
starting permutation: s6-acquire-advisory-lock s1-shard-copy-c1-online s7-get-progress s6-release-advisory-lock s1-wait s7-get-progress
starting permutation: s6-acquire-advisory-lock s1-shard-copy-c1-online s7-get-progress s6-release-advisory-lock s1-commit s7-get-progress
master_set_node_property master_set_node_property
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -1024,7 +943,6 @@ pg_advisory_lock
(1 row) (1 row)
step s1-shard-copy-c1-online: step s1-shard-copy-c1-online:
BEGIN;
UPDATE pg_dist_partition SET repmodel = 'c' WHERE logicalrelid IN ('colocated1', 'colocated2'); UPDATE pg_dist_partition SET repmodel = 'c' WHERE logicalrelid IN ('colocated1', 'colocated2');
SELECT citus_copy_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, transfer_mode:='force_logical'); SELECT citus_copy_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, transfer_mode:='force_logical');
<waiting ...> <waiting ...>
@ -1068,9 +986,7 @@ citus_copy_shard_placement
(1 row) (1 row)
step s1-commit: step s1-wait:
COMMIT;
step s7-get-progress: step s7-get-progress:
set LOCAL client_min_messages=NOTICE; 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), (50000), (200000), (400000))
@ -1096,7 +1012,7 @@ table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname
(0 rows) (0 rows)
starting permutation: s2-lock-1-start s1-shard-move-c1-block-writes s4-shard-move-sep-block-writes-without-advisory-locks s7-get-progress s2-unlock-1-start s1-commit s4-commit s7-get-progress starting permutation: s2-lock-1-start s1-shard-move-c1-block-writes s4-shard-move-sep-block-writes-without-advisory-locks s7-get-progress s2-unlock-1-start s1-wait s4-commit s7-get-progress
master_set_node_property master_set_node_property
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -1108,7 +1024,6 @@ step s2-lock-1-start:
DELETE FROM separate WHERE test_id = 1; DELETE FROM separate WHERE test_id = 1;
step s1-shard-move-c1-block-writes: step s1-shard-move-c1-block-writes:
BEGIN;
SELECT citus_move_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, shard_transfer_mode:='block_writes'); SELECT citus_move_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, shard_transfer_mode:='block_writes');
<waiting ...> <waiting ...>
step s4-shard-move-sep-block-writes-without-advisory-locks: step s4-shard-move-sep-block-writes-without-advisory-locks:
@ -1158,9 +1073,7 @@ citus_move_shard_placement
(1 row) (1 row)
step s1-commit: step s1-wait:
COMMIT;
step s4-commit: step s4-commit:
COMMIT; COMMIT;
@ -1189,7 +1102,7 @@ table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname
(0 rows) (0 rows)
starting permutation: s6-acquire-advisory-lock s1-shard-move-c1-block-writes s4-shard-move-sep-block-writes s7-get-progress s6-release-advisory-lock s1-commit s4-commit s7-get-progress starting permutation: s6-acquire-advisory-lock s1-shard-move-c1-block-writes s4-shard-move-sep-block-writes s7-get-progress s6-release-advisory-lock s1-wait s4-commit s7-get-progress
master_set_node_property master_set_node_property
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -1204,7 +1117,6 @@ pg_advisory_lock
(1 row) (1 row)
step s1-shard-move-c1-block-writes: step s1-shard-move-c1-block-writes:
BEGIN;
SELECT citus_move_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, shard_transfer_mode:='block_writes'); SELECT citus_move_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, shard_transfer_mode:='block_writes');
<waiting ...> <waiting ...>
step s4-shard-move-sep-block-writes: step s4-shard-move-sep-block-writes:
@ -1252,15 +1164,13 @@ citus_move_shard_placement
(1 row) (1 row)
step s1-commit:
COMMIT;
step s4-shard-move-sep-block-writes: <... completed> step s4-shard-move-sep-block-writes: <... completed>
citus_move_shard_placement citus_move_shard_placement
--------------------------------------------------------------------- ---------------------------------------------------------------------
(1 row) (1 row)
step s1-wait:
step s4-commit: step s4-commit:
COMMIT; COMMIT;

43
src/test/regress/spec/isolation_shard_rebalancer_progress.spec
View File

@ -35,48 +35,37 @@ session "s1"
step "s1-rebalance-c1-block-writes" step "s1-rebalance-c1-block-writes"
{ {
BEGIN;
SELECT * FROM get_rebalance_table_shards_plan('colocated1');
SELECT rebalance_table_shards('colocated1', shard_transfer_mode:='block_writes'); SELECT rebalance_table_shards('colocated1', shard_transfer_mode:='block_writes');
} }
step "s1-rebalance-c1-online" step "s1-rebalance-c1-online"
{ {
BEGIN;
SELECT * FROM get_rebalance_table_shards_plan('colocated1');
SELECT rebalance_table_shards('colocated1', shard_transfer_mode:='force_logical'); SELECT rebalance_table_shards('colocated1', shard_transfer_mode:='force_logical');
} }
step "s1-shard-move-c1-block-writes" step "s1-shard-move-c1-block-writes"
{ {
BEGIN;
SELECT citus_move_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, shard_transfer_mode:='block_writes'); SELECT citus_move_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, shard_transfer_mode:='block_writes');
} }
step "s1-shard-copy-c1-block-writes" step "s1-shard-copy-c1-block-writes"
{ {
BEGIN;
UPDATE pg_dist_partition SET repmodel = 'c' WHERE logicalrelid IN ('colocated1', 'colocated2'); UPDATE pg_dist_partition SET repmodel = 'c' WHERE logicalrelid IN ('colocated1', 'colocated2');
SELECT citus_copy_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, transfer_mode:='block_writes'); SELECT citus_copy_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, transfer_mode:='block_writes');
} }
step "s1-shard-move-c1-online" step "s1-shard-move-c1-online"
{ {
BEGIN;
SELECT citus_move_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, shard_transfer_mode:='force_logical'); SELECT citus_move_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, shard_transfer_mode:='force_logical');
} }
step "s1-shard-copy-c1-online" step "s1-shard-copy-c1-online"
{ {
BEGIN;
UPDATE pg_dist_partition SET repmodel = 'c' WHERE logicalrelid IN ('colocated1', 'colocated2'); UPDATE pg_dist_partition SET repmodel = 'c' WHERE logicalrelid IN ('colocated1', 'colocated2');
SELECT citus_copy_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, transfer_mode:='force_logical'); SELECT citus_copy_shard_placement(1500001, 'localhost', 57637, 'localhost', 57638, transfer_mode:='force_logical');
} }
step "s1-commit" step "s1-wait" {}
{
COMMIT;
}
session "s2" session "s2"
@ -186,30 +175,30 @@ step "s7-get-progress"
} }
// blocking rebalancer does what it should // blocking rebalancer does what it should
permutation "s2-lock-1-start" "s1-rebalance-c1-block-writes" "s7-get-progress" "s2-unlock-1-start" "s1-commit" "s7-get-progress" permutation "s2-lock-1-start" "s1-rebalance-c1-block-writes" "s7-get-progress" "s2-unlock-1-start" "s1-wait" "s7-get-progress"
permutation "s3-lock-2-start" "s1-rebalance-c1-block-writes" "s7-get-progress" "s3-unlock-2-start" "s1-commit" "s7-get-progress" permutation "s3-lock-2-start" "s1-rebalance-c1-block-writes" "s7-get-progress" "s3-unlock-2-start" "s1-wait" "s7-get-progress"
permutation "s6-acquire-advisory-lock" "s1-rebalance-c1-block-writes" "s7-get-progress" "s6-release-advisory-lock" "s1-commit" "s7-get-progress" permutation "s6-acquire-advisory-lock" "s1-rebalance-c1-block-writes" "s7-get-progress" "s6-release-advisory-lock" "s1-wait" "s7-get-progress"
// online rebalancer // online rebalancer
permutation "s5-acquire-advisory-lock" "s1-rebalance-c1-online" "s7-get-progress" "s5-release-advisory-lock" "s1-commit" "s7-get-progress" permutation "s5-acquire-advisory-lock" "s1-rebalance-c1-online" "s7-get-progress" "s5-release-advisory-lock" "s1-wait" "s7-get-progress"
permutation "s6-acquire-advisory-lock" "s1-rebalance-c1-online" "s7-get-progress" "s6-release-advisory-lock" "s1-commit" "s7-get-progress" permutation "s6-acquire-advisory-lock" "s1-rebalance-c1-online" "s7-get-progress" "s6-release-advisory-lock" "s1-wait" "s7-get-progress"
// blocking shard move // blocking shard move
permutation "s2-lock-1-start" "s1-shard-move-c1-block-writes" "s7-get-progress" "s2-unlock-1-start" "s1-commit" "s7-get-progress" permutation "s2-lock-1-start" "s1-shard-move-c1-block-writes" "s7-get-progress" "s2-unlock-1-start" "s1-wait" "s7-get-progress"
permutation "s6-acquire-advisory-lock" "s1-shard-move-c1-block-writes" "s7-get-progress" "s6-release-advisory-lock" "s1-commit" "s7-get-progress" permutation "s6-acquire-advisory-lock" "s1-shard-move-c1-block-writes" "s7-get-progress" "s6-release-advisory-lock" "s1-wait" "s7-get-progress"
// blocking shard copy // blocking shard copy
permutation "s2-lock-1-start" "s1-shard-copy-c1-block-writes" "s7-get-progress" "s2-unlock-1-start" "s1-commit" permutation "s2-lock-1-start" "s1-shard-copy-c1-block-writes" "s7-get-progress" "s2-unlock-1-start" "s1-wait"
permutation "s6-acquire-advisory-lock" "s1-shard-copy-c1-block-writes" "s7-get-progress" "s6-release-advisory-lock" "s1-commit" "s7-get-progress" permutation "s6-acquire-advisory-lock" "s1-shard-copy-c1-block-writes" "s7-get-progress" "s6-release-advisory-lock" "s1-wait" "s7-get-progress"
// online shard move // online shard move
permutation "s5-acquire-advisory-lock" "s1-shard-move-c1-online" "s7-get-progress" "s5-release-advisory-lock" "s1-commit" "s7-get-progress" permutation "s5-acquire-advisory-lock" "s1-shard-move-c1-online" "s7-get-progress" "s5-release-advisory-lock" "s1-wait" "s7-get-progress"
permutation "s6-acquire-advisory-lock" "s1-shard-move-c1-online" "s7-get-progress" "s6-release-advisory-lock" "s1-commit" "s7-get-progress" permutation "s6-acquire-advisory-lock" "s1-shard-move-c1-online" "s7-get-progress" "s6-release-advisory-lock" "s1-wait" "s7-get-progress"
// online shard copy // online shard copy
permutation "s5-acquire-advisory-lock" "s1-shard-copy-c1-online" "s7-get-progress" "s5-release-advisory-lock" "s1-commit" permutation "s5-acquire-advisory-lock" "s1-shard-copy-c1-online" "s7-get-progress" "s5-release-advisory-lock" "s1-wait"
permutation "s6-acquire-advisory-lock" "s1-shard-copy-c1-online" "s7-get-progress" "s6-release-advisory-lock" "s1-commit" "s7-get-progress" permutation "s6-acquire-advisory-lock" "s1-shard-copy-c1-online" "s7-get-progress" "s6-release-advisory-lock" "s1-wait" "s7-get-progress"
// parallel blocking shard move // parallel blocking shard move
permutation "s2-lock-1-start" "s1-shard-move-c1-block-writes" "s4-shard-move-sep-block-writes-without-advisory-locks"("s1-shard-move-c1-block-writes") "s7-get-progress" "s2-unlock-1-start" "s1-commit" "s4-commit" "s7-get-progress" permutation "s2-lock-1-start" "s1-shard-move-c1-block-writes" "s4-shard-move-sep-block-writes-without-advisory-locks"("s1-shard-move-c1-block-writes") "s7-get-progress" "s2-unlock-1-start" "s1-wait" "s4-commit" "s7-get-progress"
permutation "s6-acquire-advisory-lock" "s1-shard-move-c1-block-writes" "s4-shard-move-sep-block-writes"("s1-shard-move-c1-block-writes") "s7-get-progress" "s6-release-advisory-lock" "s1-commit" "s4-commit" "s7-get-progress" permutation "s6-acquire-advisory-lock" "s1-shard-move-c1-block-writes" "s4-shard-move-sep-block-writes"("s1-shard-move-c1-block-writes") "s7-get-progress" "s6-release-advisory-lock" "s1-wait" "s4-commit" "s7-get-progress"