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

w

fix_concurrent_shard_move_create_table_try_2
Onder Kalaci 2022-07-18 10:35:05 +02:00
parent bf9b64fdc1
commit cd4f1a420c
3 changed files with 87 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
src/test/regress/expected/isolation_logical_replication_single_shard_commands.out
View File

@ -10,10 +10,10 @@ pg_advisory_lock
(1 row) (1 row)
step s1-begin: step s1-begin:
BEGIN; BEGIN;
step s1-move-placement: step s1-move-placement:
SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638); SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638);
<waiting ...> <waiting ...>
step s2-insert: step s2-insert:
INSERT INTO logical_replicate_placement VALUES (15, 15); INSERT INTO logical_replicate_placement VALUES (15, 15);
@ -33,7 +33,7 @@ master_move_shard_placement
(1 row) (1 row)
step s1-end: step s1-end:
COMMIT; COMMIT;
step s1-select: step s1-select:
SELECT * FROM logical_replicate_placement order by y; SELECT * FROM logical_replicate_placement order by y;
@ -62,10 +62,10 @@ pg_advisory_lock
(1 row) (1 row)
step s1-begin: step s1-begin:
BEGIN; BEGIN;
step s1-move-placement: step s1-move-placement:
SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638); SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638);
<waiting ...> <waiting ...>
step s2-upsert: step s2-upsert:
INSERT INTO logical_replicate_placement VALUES (15, 15); INSERT INTO logical_replicate_placement VALUES (15, 15);
@ -86,7 +86,7 @@ master_move_shard_placement
(1 row) (1 row)
step s1-end: step s1-end:
COMMIT; COMMIT;
step s1-select: step s1-select:
SELECT * FROM logical_replicate_placement order by y; SELECT * FROM logical_replicate_placement order by y;
@ -118,10 +118,10 @@ pg_advisory_lock
(1 row) (1 row)
step s1-begin: step s1-begin:
BEGIN; BEGIN;
step s1-move-placement: step s1-move-placement:
SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638); SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638);
<waiting ...> <waiting ...>
step s2-update: step s2-update:
UPDATE logical_replicate_placement SET y = y + 1 WHERE x = 15; UPDATE logical_replicate_placement SET y = y + 1 WHERE x = 15;
@ -141,7 +141,7 @@ master_move_shard_placement
(1 row) (1 row)
step s1-end: step s1-end:
COMMIT; COMMIT;
step s1-select: step s1-select:
SELECT * FROM logical_replicate_placement order by y; SELECT * FROM logical_replicate_placement order by y;
@ -173,10 +173,10 @@ pg_advisory_lock
(1 row) (1 row)
step s1-begin: step s1-begin:
BEGIN; BEGIN;
step s1-move-placement: step s1-move-placement:
SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638); SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638);
<waiting ...> <waiting ...>
step s2-delete: step s2-delete:
DELETE FROM logical_replicate_placement WHERE x = 15; DELETE FROM logical_replicate_placement WHERE x = 15;
@ -196,7 +196,7 @@ master_move_shard_placement
(1 row) (1 row)
step s1-end: step s1-end:
COMMIT; COMMIT;
step s1-select: step s1-select:
SELECT * FROM logical_replicate_placement order by y; SELECT * FROM logical_replicate_placement order by y;
@ -227,10 +227,10 @@ pg_advisory_lock
(1 row) (1 row)
step s1-begin: step s1-begin:
BEGIN; BEGIN;
step s1-move-placement: step s1-move-placement:
SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638); SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638);
<waiting ...> <waiting ...>
step s2-select: step s2-select:
SELECT * FROM logical_replicate_placement ORDER BY y; SELECT * FROM logical_replicate_placement ORDER BY y;
@ -255,7 +255,7 @@ master_move_shard_placement
(1 row) (1 row)
step s1-end: step s1-end:
COMMIT; COMMIT;
step s1-get-shard-distribution: step s1-get-shard-distribution:
select nodeport from pg_dist_placement inner join pg_dist_node on(pg_dist_placement.groupid = pg_dist_node.groupid) where shardstate != 4 AND shardid in (SELECT * FROM selected_shard) order by nodeport; select nodeport from pg_dist_placement inner join pg_dist_node on(pg_dist_placement.groupid = pg_dist_node.groupid) where shardstate != 4 AND shardid in (SELECT * FROM selected_shard) order by nodeport;
@ -279,10 +279,10 @@ pg_advisory_lock
(1 row) (1 row)
step s1-begin: step s1-begin:
BEGIN; BEGIN;
step s1-move-placement: step s1-move-placement:
SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638); SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638);
<waiting ...> <waiting ...>
step s2-select-for-update: step s2-select-for-update:
SELECT * FROM logical_replicate_placement WHERE x=15 FOR UPDATE; SELECT * FROM logical_replicate_placement WHERE x=15 FOR UPDATE;
@ -307,7 +307,7 @@ master_move_shard_placement
(1 row) (1 row)
step s1-end: step s1-end:
COMMIT; COMMIT;
step s1-get-shard-distribution: step s1-get-shard-distribution:
select nodeport from pg_dist_placement inner join pg_dist_node on(pg_dist_placement.groupid = pg_dist_node.groupid) where shardstate != 4 AND shardid in (SELECT * FROM selected_shard) order by nodeport; select nodeport from pg_dist_placement inner join pg_dist_node on(pg_dist_placement.groupid = pg_dist_node.groupid) where shardstate != 4 AND shardid in (SELECT * FROM selected_shard) order by nodeport;
@ -320,7 +320,7 @@ nodeport
starting permutation: s1-begin s2-begin s2-insert s1-move-placement s2-end s1-end s1-select s1-get-shard-distribution starting permutation: s1-begin s2-begin s2-insert s1-move-placement s2-end s1-end s1-select s1-get-shard-distribution
step s1-begin: step s1-begin:
BEGIN; BEGIN;
step s2-begin: step s2-begin:
BEGIN; BEGIN;
@ -329,10 +329,10 @@ step s2-insert:
INSERT INTO logical_replicate_placement VALUES (15, 15); INSERT INTO logical_replicate_placement VALUES (15, 15);
step s1-move-placement: step s1-move-placement:
SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638); SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638);
<waiting ...> <waiting ...>
step s2-end: step s2-end:
COMMIT; COMMIT;
step s1-move-placement: <... completed> step s1-move-placement: <... completed>
master_move_shard_placement master_move_shard_placement
@ -341,7 +341,7 @@ master_move_shard_placement
(1 row) (1 row)
step s1-end: step s1-end:
COMMIT; COMMIT;
step s1-select: step s1-select:
SELECT * FROM logical_replicate_placement order by y; SELECT * FROM logical_replicate_placement order by y;
@ -362,7 +362,7 @@ nodeport
starting permutation: s1-begin s2-begin s2-upsert s1-move-placement s2-end s1-end s1-select s1-get-shard-distribution starting permutation: s1-begin s2-begin s2-upsert s1-move-placement s2-end s1-end s1-select s1-get-shard-distribution
step s1-begin: step s1-begin:
BEGIN; BEGIN;
step s2-begin: step s2-begin:
BEGIN; BEGIN;
@ -372,10 +372,10 @@ step s2-upsert:
INSERT INTO logical_replicate_placement VALUES (15, 15) ON CONFLICT (x) DO UPDATE SET y = logical_replicate_placement.y + 1; INSERT INTO logical_replicate_placement VALUES (15, 15) ON CONFLICT (x) DO UPDATE SET y = logical_replicate_placement.y + 1;
step s1-move-placement: step s1-move-placement:
SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638); SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638);
<waiting ...> <waiting ...>
step s2-end: step s2-end:
COMMIT; COMMIT;
step s1-move-placement: <... completed> step s1-move-placement: <... completed>
master_move_shard_placement master_move_shard_placement
@ -384,7 +384,7 @@ master_move_shard_placement
(1 row) (1 row)
step s1-end: step s1-end:
COMMIT; COMMIT;
step s1-select: step s1-select:
SELECT * FROM logical_replicate_placement order by y; SELECT * FROM logical_replicate_placement order by y;
@ -408,7 +408,7 @@ step s1-insert:
INSERT INTO logical_replicate_placement VALUES (15, 15); INSERT INTO logical_replicate_placement VALUES (15, 15);
step s1-begin: step s1-begin:
BEGIN; BEGIN;
step s2-begin: step s2-begin:
BEGIN; BEGIN;
@ -417,10 +417,10 @@ step s2-update:
UPDATE logical_replicate_placement SET y = y + 1 WHERE x = 15; UPDATE logical_replicate_placement SET y = y + 1 WHERE x = 15;
step s1-move-placement: step s1-move-placement:
SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638); SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638);
<waiting ...> <waiting ...>
step s2-end: step s2-end:
COMMIT; COMMIT;
step s1-move-placement: <... completed> step s1-move-placement: <... completed>
master_move_shard_placement master_move_shard_placement
@ -429,7 +429,7 @@ master_move_shard_placement
(1 row) (1 row)
step s1-end: step s1-end:
COMMIT; COMMIT;
step s1-select: step s1-select:
SELECT * FROM logical_replicate_placement order by y; SELECT * FROM logical_replicate_placement order by y;
@ -453,7 +453,7 @@ step s1-insert:
INSERT INTO logical_replicate_placement VALUES (15, 15); INSERT INTO logical_replicate_placement VALUES (15, 15);
step s1-begin: step s1-begin:
BEGIN; BEGIN;
step s2-begin: step s2-begin:
BEGIN; BEGIN;
@ -462,10 +462,10 @@ step s2-delete:
DELETE FROM logical_replicate_placement WHERE x = 15; DELETE FROM logical_replicate_placement WHERE x = 15;
step s1-move-placement: step s1-move-placement:
SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638); SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638);
<waiting ...> <waiting ...>
step s2-end: step s2-end:
COMMIT; COMMIT;
step s1-move-placement: <... completed> step s1-move-placement: <... completed>
master_move_shard_placement master_move_shard_placement
@ -474,7 +474,7 @@ master_move_shard_placement
(1 row) (1 row)
step s1-end: step s1-end:
COMMIT; COMMIT;
step s1-select: step s1-select:
SELECT * FROM logical_replicate_placement order by y; SELECT * FROM logical_replicate_placement order by y;
@ -497,7 +497,7 @@ step s1-insert:
INSERT INTO logical_replicate_placement VALUES (15, 15); INSERT INTO logical_replicate_placement VALUES (15, 15);
step s1-begin: step s1-begin:
BEGIN; BEGIN;
step s2-begin: step s2-begin:
BEGIN; BEGIN;
@ -511,7 +511,7 @@ step s2-select:
(1 row) (1 row)
step s1-move-placement: step s1-move-placement:
SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638); SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638);
master_move_shard_placement master_move_shard_placement
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -519,10 +519,10 @@ master_move_shard_placement
(1 row) (1 row)
step s2-end: step s2-end:
COMMIT; COMMIT;
step s1-end: step s1-end:
COMMIT; COMMIT;
step s1-get-shard-distribution: step s1-get-shard-distribution:
select nodeport from pg_dist_placement inner join pg_dist_node on(pg_dist_placement.groupid = pg_dist_node.groupid) where shardstate != 4 AND shardid in (SELECT * FROM selected_shard) order by nodeport; select nodeport from pg_dist_placement inner join pg_dist_node on(pg_dist_placement.groupid = pg_dist_node.groupid) where shardstate != 4 AND shardid in (SELECT * FROM selected_shard) order by nodeport;
@ -538,7 +538,7 @@ step s1-insert:
INSERT INTO logical_replicate_placement VALUES (15, 15); INSERT INTO logical_replicate_placement VALUES (15, 15);
step s1-begin: step s1-begin:
BEGIN; BEGIN;
step s2-begin: step s2-begin:
BEGIN; BEGIN;
@ -552,10 +552,10 @@ step s2-select-for-update:
(1 row) (1 row)
step s1-move-placement: step s1-move-placement:
SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638); SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638);
<waiting ...> <waiting ...>
step s2-end: step s2-end:
COMMIT; COMMIT;
step s1-move-placement: <... completed> step s1-move-placement: <... completed>
master_move_shard_placement master_move_shard_placement
@ -564,7 +564,7 @@ master_move_shard_placement
(1 row) (1 row)
step s1-end: step s1-end:
COMMIT; COMMIT;
step s1-get-shard-distribution: step s1-get-shard-distribution:
select nodeport from pg_dist_placement inner join pg_dist_node on(pg_dist_placement.groupid = pg_dist_node.groupid) where shardstate != 4 AND shardid in (SELECT * FROM selected_shard) order by nodeport; select nodeport from pg_dist_placement inner join pg_dist_node on(pg_dist_placement.groupid = pg_dist_node.groupid) where shardstate != 4 AND shardid in (SELECT * FROM selected_shard) order by nodeport;
@ -577,13 +577,13 @@ nodeport
starting permutation: s1-begin s2-begin s1-move-placement s2-move-placement s1-end s2-end starting permutation: s1-begin s2-begin s1-move-placement s2-move-placement s1-end s2-end
step s1-begin: step s1-begin:
BEGIN; BEGIN;
step s2-begin: step s2-begin:
BEGIN; BEGIN;
step s1-move-placement: step s1-move-placement:
SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638); SELECT master_move_shard_placement((SELECT * FROM selected_shard), 'localhost', 57637, 'localhost', 57638);
master_move_shard_placement master_move_shard_placement
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -591,19 +591,14 @@ master_move_shard_placement
(1 row) (1 row)
step s2-move-placement: step s2-move-placement:
SELECT master_move_shard_placement( SELECT master_move_shard_placement(
get_shard_id_for_distribution_column('logical_replicate_placement', 4), get_shard_id_for_distribution_column('logical_replicate_placement', 4),
'localhost', 57637, 'localhost', 57638); 'localhost', 57637, 'localhost', 57638);
<waiting ...>
ERROR: could not acquire the lock required to move placement public.logical_replicate_placement
step s1-end: step s1-end:
COMMIT; COMMIT;
step s2-move-placement: <... completed>
master_move_shard_placement
---------------------------------------------------------------------
(1 row)
step s2-end: step s2-end:
COMMIT; COMMIT;

72
src/test/regress/expected/isolation_move_placement_vs_move_placement.out
View File

@ -2,13 +2,13 @@ Parsed test spec with 2 sessions
starting permutation: s1-load-cache s2-begin s2-move-placement s1-move-placement s2-commit s2-print-placements starting permutation: s1-load-cache s2-begin s2-move-placement s1-move-placement s2-commit s2-print-placements
step s1-load-cache: step s1-load-cache:
COPY test_move_table FROM PROGRAM 'echo "1,1\n2,2\n3,3\n4,4\n5,5"' WITH CSV; COPY test_move_table FROM PROGRAM 'echo "1,1\n2,2\n3,3\n4,4\n5,5"' WITH CSV;
step s2-begin: step s2-begin:
BEGIN; BEGIN;
step s2-move-placement: step s2-move-placement:
SELECT master_move_shard_placement((SELECT * FROM selected_shard_for_test_table), 'localhost', 57637, 'localhost', 57638, 'force_logical'); SELECT master_move_shard_placement((SELECT * FROM selected_shard_for_test_table), 'localhost', 57637, 'localhost', 57638, 'force_logical');
master_move_shard_placement master_move_shard_placement
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -16,24 +16,23 @@ master_move_shard_placement
(1 row) (1 row)
step s1-move-placement: step s1-move-placement:
SELECT master_move_shard_placement((SELECT * FROM selected_shard_for_test_table), 'localhost', 57637, 'localhost', 57638, 'force_logical'); SELECT master_move_shard_placement((SELECT * FROM selected_shard_for_test_table), 'localhost', 57637, 'localhost', 57638, 'force_logical');
<waiting ...>
step s2-commit: ERROR: could not acquire the lock required to move placement public.test_move_table
COMMIT; step s2-commit:
COMMIT;
step s1-move-placement: <... completed>
ERROR: source placement must be in active state
step s2-print-placements: step s2-print-placements:
SELECT SELECT
nodename, nodeport, count(*) nodename, nodeport, count(*)
FROM FROM
pg_dist_shard_placement pg_dist_shard_placement
WHERE WHERE
shardid IN (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_move_table'::regclass) shardid IN (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_move_table'::regclass)
AND AND
shardstate = 1 shardstate = 1
GROUP BY GROUP BY
nodename, nodeport; nodename, nodeport;
nodename |nodeport|count nodename |nodeport|count
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -43,10 +42,10 @@ localhost| 57638| 2
starting permutation: s2-begin s2-move-placement s1-move-placement s2-commit s2-print-placements starting permutation: s2-begin s2-move-placement s1-move-placement s2-commit s2-print-placements
step s2-begin: step s2-begin:
BEGIN; BEGIN;
step s2-move-placement: step s2-move-placement:
SELECT master_move_shard_placement((SELECT * FROM selected_shard_for_test_table), 'localhost', 57637, 'localhost', 57638, 'force_logical'); SELECT master_move_shard_placement((SELECT * FROM selected_shard_for_test_table), 'localhost', 57637, 'localhost', 57638, 'force_logical');
master_move_shard_placement master_move_shard_placement
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -54,24 +53,23 @@ master_move_shard_placement
(1 row) (1 row)
step s1-move-placement: step s1-move-placement:
SELECT master_move_shard_placement((SELECT * FROM selected_shard_for_test_table), 'localhost', 57637, 'localhost', 57638, 'force_logical'); SELECT master_move_shard_placement((SELECT * FROM selected_shard_for_test_table), 'localhost', 57637, 'localhost', 57638, 'force_logical');
<waiting ...>
step s2-commit: ERROR: could not acquire the lock required to move placement public.test_move_table
COMMIT; step s2-commit:
COMMIT;
step s1-move-placement: <... completed>
ERROR: source placement must be in active state
step s2-print-placements: step s2-print-placements:
SELECT SELECT
nodename, nodeport, count(*) nodename, nodeport, count(*)
FROM FROM
pg_dist_shard_placement pg_dist_shard_placement
WHERE WHERE
shardid IN (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_move_table'::regclass) shardid IN (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_move_table'::regclass)
AND AND
shardstate = 1 shardstate = 1
GROUP BY GROUP BY
nodename, nodeport; nodename, nodeport;
nodename |nodeport|count nodename |nodeport|count
--------------------------------------------------------------------- ---------------------------------------------------------------------

2
src/test/regress/spec/isolation_logical_replication_single_shard_commands.spec
View File

@ -139,5 +139,5 @@ permutation "s1-insert" "s1-begin" "s2-begin" "s2-select" "s1-move-placement" "s
permutation "s1-insert" "s1-begin" "s2-begin" "s2-select-for-update" "s1-move-placement" "s2-end" "s1-end" "s1-get-shard-distribution" permutation "s1-insert" "s1-begin" "s2-begin" "s2-select-for-update" "s1-move-placement" "s2-end" "s1-end" "s1-get-shard-distribution"
// This test actually blocks because we don't want two non blocking shard moves at the same time // This test fails because we don't want two non blocking shard moves at the same time
permutation "s1-begin" "s2-begin" "s1-move-placement" "s2-move-placement" "s1-end" "s2-end" permutation "s1-begin" "s2-begin" "s1-move-placement" "s2-move-placement" "s1-end" "s2-end"