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

Add colocation checks for shard splits

pull/6066/head
Onder Kalaci 2022-07-21 13:13:02 +02:00
parent 12fa3aaf6b
commit 5bc8a81aa7
5 changed files with 349 additions and 333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/distributed/operations/shard_split.c
View File

@ -35,6 +35,7 @@
#include "distributed/metadata_sync.h" #include "distributed/metadata_sync.h"
#include "distributed/multi_physical_planner.h" #include "distributed/multi_physical_planner.h"
#include "distributed/deparse_shard_query.h" #include "distributed/deparse_shard_query.h"
#include "distributed/shard_rebalancer.h"
/* /*
* Entry for map that tracks ShardInterval -> Placement Node * Entry for map that tracks ShardInterval -> Placement Node
@ -329,6 +330,9 @@ SplitShard(SplitMode splitMode,
ShardInterval *shardIntervalToSplit = LoadShardInterval(shardIdToSplit); ShardInterval *shardIntervalToSplit = LoadShardInterval(shardIdToSplit);
List *colocatedTableList = ColocatedTableList(shardIntervalToSplit->relationId); List *colocatedTableList = ColocatedTableList(shardIntervalToSplit->relationId);
Oid relationId = RelationIdForShard(shardIdToSplit);
AcquirePlacementColocationLock(relationId, ExclusiveLock, "split");
/* sort the tables to avoid deadlocks */ /* sort the tables to avoid deadlocks */
colocatedTableList = SortList(colocatedTableList, CompareOids); colocatedTableList = SortList(colocatedTableList, CompareOids);
Oid colocatedTableId = InvalidOid; Oid colocatedTableId = InvalidOid;

580
src/test/regress/expected/isolation_blocking_shard_split.out
View File

@ -7,13 +7,13 @@ create_distributed_table
(1 row) (1 row)
step s1-load-cache: step s1-load-cache:
-- Indirect way to load cache. -- Indirect way to load cache.
TRUNCATE to_split_table; TRUNCATE to_split_table;
step s1-insert: step s1-insert:
-- Id '123456789' maps to shard xxxxx. -- Id '123456789' maps to shard xxxxx.
SELECT get_shard_id_for_distribution_column('to_split_table', 123456789); SELECT get_shard_id_for_distribution_column('to_split_table', 123456789);
INSERT INTO to_split_table VALUES (123456789, 1); INSERT INTO to_split_table VALUES (123456789, 1);
get_shard_id_for_distribution_column get_shard_id_for_distribution_column
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -27,7 +27,7 @@ step s1-begin:
SET citus.select_opens_transaction_block TO false; SET citus.select_opens_transaction_block TO false;
step s1-select: step s1-select:
SELECT count(*) FROM to_split_table WHERE id = 123456789; SELECT count(*) FROM to_split_table WHERE id = 123456789;
count count
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -35,14 +35,14 @@ count
(1 row) (1 row)
step s2-begin: step s2-begin:
BEGIN; BEGIN;
step s2-blocking-shard-split: step s2-blocking-shard-split:
SELECT pg_catalog.citus_split_shard_by_split_points( SELECT pg_catalog.citus_split_shard_by_split_points(
1500002, 1500002,
ARRAY['1073741824'], ARRAY['1073741824'],
ARRAY[1, 2], ARRAY[1, 2],
'block_writes'); 'block_writes');
citus_split_shard_by_split_points citus_split_shard_by_split_points
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -50,26 +50,26 @@ citus_split_shard_by_split_points
(1 row) (1 row)
step s1-update: step s1-update:
UPDATE to_split_table SET value = 111 WHERE id = 123456789; UPDATE to_split_table SET value = 111 WHERE id = 123456789;
<waiting ...> <waiting ...>
step s2-commit: step s2-commit:
COMMIT; COMMIT;
step s1-update: <... completed> step s1-update: <... completed>
ERROR: could not find valid entry for shard xxxxx ERROR: could not find valid entry for shard xxxxx
step s1-commit: step s1-commit:
COMMIT; COMMIT;
step s2-print-cluster: step s2-print-cluster:
-- row count per shard -- row count per shard
SELECT SELECT
nodeport, shardid, success, result nodeport, shardid, success, result
FROM FROM
run_command_on_placements('to_split_table', 'select count(*) from %s') run_command_on_placements('to_split_table', 'select count(*) from %s')
ORDER BY ORDER BY
nodeport, shardid; nodeport, shardid;
-- rows -- rows
SELECT id, value FROM to_split_table ORDER BY id, value; SELECT id, value FROM to_split_table ORDER BY id, value;
nodeport|shardid|success|result nodeport|shardid|success|result
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -91,13 +91,13 @@ create_distributed_table
(1 row) (1 row)
step s1-load-cache: step s1-load-cache:
-- Indirect way to load cache. -- Indirect way to load cache.
TRUNCATE to_split_table; TRUNCATE to_split_table;
step s1-insert: step s1-insert:
-- Id '123456789' maps to shard xxxxx. -- Id '123456789' maps to shard xxxxx.
SELECT get_shard_id_for_distribution_column('to_split_table', 123456789); SELECT get_shard_id_for_distribution_column('to_split_table', 123456789);
INSERT INTO to_split_table VALUES (123456789, 1); INSERT INTO to_split_table VALUES (123456789, 1);
get_shard_id_for_distribution_column get_shard_id_for_distribution_column
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -111,7 +111,7 @@ step s1-begin:
SET citus.select_opens_transaction_block TO false; SET citus.select_opens_transaction_block TO false;
step s1-select: step s1-select:
SELECT count(*) FROM to_split_table WHERE id = 123456789; SELECT count(*) FROM to_split_table WHERE id = 123456789;
count count
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -119,14 +119,14 @@ count
(1 row) (1 row)
step s2-begin: step s2-begin:
BEGIN; BEGIN;
step s2-blocking-shard-split: step s2-blocking-shard-split:
SELECT pg_catalog.citus_split_shard_by_split_points( SELECT pg_catalog.citus_split_shard_by_split_points(
1500002, 1500002,
ARRAY['1073741824'], ARRAY['1073741824'],
ARRAY[1, 2], ARRAY[1, 2],
'block_writes'); 'block_writes');
citus_split_shard_by_split_points citus_split_shard_by_split_points
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -134,26 +134,26 @@ citus_split_shard_by_split_points
(1 row) (1 row)
step s1-delete: step s1-delete:
DELETE FROM to_split_table WHERE id = 123456789; DELETE FROM to_split_table WHERE id = 123456789;
<waiting ...> <waiting ...>
step s2-commit: step s2-commit:
COMMIT; COMMIT;
step s1-delete: <... completed> step s1-delete: <... completed>
ERROR: could not find valid entry for shard xxxxx ERROR: could not find valid entry for shard xxxxx
step s1-commit: step s1-commit:
COMMIT; COMMIT;
step s2-print-cluster: step s2-print-cluster:
-- row count per shard -- row count per shard
SELECT SELECT
nodeport, shardid, success, result nodeport, shardid, success, result
FROM FROM
run_command_on_placements('to_split_table', 'select count(*) from %s') run_command_on_placements('to_split_table', 'select count(*) from %s')
ORDER BY ORDER BY
nodeport, shardid; nodeport, shardid;
-- rows -- rows
SELECT id, value FROM to_split_table ORDER BY id, value; SELECT id, value FROM to_split_table ORDER BY id, value;
nodeport|shardid|success|result nodeport|shardid|success|result
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -175,8 +175,8 @@ create_distributed_table
(1 row) (1 row)
step s1-load-cache: step s1-load-cache:
-- Indirect way to load cache. -- Indirect way to load cache.
TRUNCATE to_split_table; TRUNCATE to_split_table;
step s1-begin: step s1-begin:
BEGIN; BEGIN;
@ -185,7 +185,7 @@ step s1-begin:
SET citus.select_opens_transaction_block TO false; SET citus.select_opens_transaction_block TO false;
step s1-select: step s1-select:
SELECT count(*) FROM to_split_table WHERE id = 123456789; SELECT count(*) FROM to_split_table WHERE id = 123456789;
count count
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -193,14 +193,14 @@ count
(1 row) (1 row)
step s2-begin: step s2-begin:
BEGIN; BEGIN;
step s2-blocking-shard-split: step s2-blocking-shard-split:
SELECT pg_catalog.citus_split_shard_by_split_points( SELECT pg_catalog.citus_split_shard_by_split_points(
1500002, 1500002,
ARRAY['1073741824'], ARRAY['1073741824'],
ARRAY[1, 2], ARRAY[1, 2],
'block_writes'); 'block_writes');
citus_split_shard_by_split_points citus_split_shard_by_split_points
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -208,12 +208,12 @@ citus_split_shard_by_split_points
(1 row) (1 row)
step s1-insert: step s1-insert:
-- Id '123456789' maps to shard xxxxx. -- Id '123456789' maps to shard xxxxx.
SELECT get_shard_id_for_distribution_column('to_split_table', 123456789); SELECT get_shard_id_for_distribution_column('to_split_table', 123456789);
INSERT INTO to_split_table VALUES (123456789, 1); INSERT INTO to_split_table VALUES (123456789, 1);
<waiting ...> <waiting ...>
step s2-commit: step s2-commit:
COMMIT; COMMIT;
step s1-insert: <... completed> step s1-insert: <... completed>
get_shard_id_for_distribution_column get_shard_id_for_distribution_column
@ -223,18 +223,18 @@ get_shard_id_for_distribution_column
ERROR: could not find valid entry for shard xxxxx ERROR: could not find valid entry for shard xxxxx
step s1-commit: step s1-commit:
COMMIT; COMMIT;
step s2-print-cluster: step s2-print-cluster:
-- row count per shard -- row count per shard
SELECT SELECT
nodeport, shardid, success, result nodeport, shardid, success, result
FROM FROM
run_command_on_placements('to_split_table', 'select count(*) from %s') run_command_on_placements('to_split_table', 'select count(*) from %s')
ORDER BY ORDER BY
nodeport, shardid; nodeport, shardid;
-- rows -- rows
SELECT id, value FROM to_split_table ORDER BY id, value; SELECT id, value FROM to_split_table ORDER BY id, value;
nodeport|shardid|success|result nodeport|shardid|success|result
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -255,8 +255,8 @@ create_distributed_table
(1 row) (1 row)
step s1-load-cache: step s1-load-cache:
-- Indirect way to load cache. -- Indirect way to load cache.
TRUNCATE to_split_table; TRUNCATE to_split_table;
step s1-begin: step s1-begin:
BEGIN; BEGIN;
@ -265,7 +265,7 @@ step s1-begin:
SET citus.select_opens_transaction_block TO false; SET citus.select_opens_transaction_block TO false;
step s1-select: step s1-select:
SELECT count(*) FROM to_split_table WHERE id = 123456789; SELECT count(*) FROM to_split_table WHERE id = 123456789;
count count
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -273,14 +273,14 @@ count
(1 row) (1 row)
step s2-begin: step s2-begin:
BEGIN; BEGIN;
step s2-blocking-shard-split: step s2-blocking-shard-split:
SELECT pg_catalog.citus_split_shard_by_split_points( SELECT pg_catalog.citus_split_shard_by_split_points(
1500002, 1500002,
ARRAY['1073741824'], ARRAY['1073741824'],
ARRAY[1, 2], ARRAY[1, 2],
'block_writes'); 'block_writes');
citus_split_shard_by_split_points citus_split_shard_by_split_points
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -288,26 +288,26 @@ citus_split_shard_by_split_points
(1 row) (1 row)
step s1-copy: step s1-copy:
COPY to_split_table FROM PROGRAM 'echo "1,1\n2,2\n3,3\n4,4\n5,5"' WITH CSV; COPY to_split_table FROM PROGRAM 'echo "1,1\n2,2\n3,3\n4,4\n5,5"' WITH CSV;
<waiting ...> <waiting ...>
step s2-commit: step s2-commit:
COMMIT; COMMIT;
step s1-copy: <... completed> step s1-copy: <... completed>
ERROR: could not find valid entry for shard xxxxx ERROR: could not find valid entry for shard xxxxx
step s1-commit: step s1-commit:
COMMIT; COMMIT;
step s2-print-cluster: step s2-print-cluster:
-- row count per shard -- row count per shard
SELECT SELECT
nodeport, shardid, success, result nodeport, shardid, success, result
FROM FROM
run_command_on_placements('to_split_table', 'select count(*) from %s') run_command_on_placements('to_split_table', 'select count(*) from %s')
ORDER BY ORDER BY
nodeport, shardid; nodeport, shardid;
-- rows -- rows
SELECT id, value FROM to_split_table ORDER BY id, value; SELECT id, value FROM to_split_table ORDER BY id, value;
nodeport|shardid|success|result nodeport|shardid|success|result
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -328,9 +328,9 @@ create_distributed_table
(1 row) (1 row)
step s1-insert: step s1-insert:
-- Id '123456789' maps to shard xxxxx. -- Id '123456789' maps to shard xxxxx.
SELECT get_shard_id_for_distribution_column('to_split_table', 123456789); SELECT get_shard_id_for_distribution_column('to_split_table', 123456789);
INSERT INTO to_split_table VALUES (123456789, 1); INSERT INTO to_split_table VALUES (123456789, 1);
get_shard_id_for_distribution_column get_shard_id_for_distribution_column
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -344,7 +344,7 @@ step s1-begin:
SET citus.select_opens_transaction_block TO false; SET citus.select_opens_transaction_block TO false;
step s1-select: step s1-select:
SELECT count(*) FROM to_split_table WHERE id = 123456789; SELECT count(*) FROM to_split_table WHERE id = 123456789;
count count
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -352,14 +352,14 @@ count
(1 row) (1 row)
step s2-begin: step s2-begin:
BEGIN; BEGIN;
step s2-blocking-shard-split: step s2-blocking-shard-split:
SELECT pg_catalog.citus_split_shard_by_split_points( SELECT pg_catalog.citus_split_shard_by_split_points(
1500002, 1500002,
ARRAY['1073741824'], ARRAY['1073741824'],
ARRAY[1, 2], ARRAY[1, 2],
'block_writes'); 'block_writes');
citus_split_shard_by_split_points citus_split_shard_by_split_points
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -367,26 +367,26 @@ citus_split_shard_by_split_points
(1 row) (1 row)
step s1-update: step s1-update:
UPDATE to_split_table SET value = 111 WHERE id = 123456789; UPDATE to_split_table SET value = 111 WHERE id = 123456789;
<waiting ...> <waiting ...>
step s2-commit: step s2-commit:
COMMIT; COMMIT;
step s1-update: <... completed> step s1-update: <... completed>
ERROR: could not find valid entry for shard xxxxx ERROR: could not find valid entry for shard xxxxx
step s1-commit: step s1-commit:
COMMIT; COMMIT;
step s2-print-cluster: step s2-print-cluster:
-- row count per shard -- row count per shard
SELECT SELECT
nodeport, shardid, success, result nodeport, shardid, success, result
FROM FROM
run_command_on_placements('to_split_table', 'select count(*) from %s') run_command_on_placements('to_split_table', 'select count(*) from %s')
ORDER BY ORDER BY
nodeport, shardid; nodeport, shardid;
-- rows -- rows
SELECT id, value FROM to_split_table ORDER BY id, value; SELECT id, value FROM to_split_table ORDER BY id, value;
nodeport|shardid|success|result nodeport|shardid|success|result
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -408,9 +408,9 @@ create_distributed_table
(1 row) (1 row)
step s1-insert: step s1-insert:
-- Id '123456789' maps to shard xxxxx. -- Id '123456789' maps to shard xxxxx.
SELECT get_shard_id_for_distribution_column('to_split_table', 123456789); SELECT get_shard_id_for_distribution_column('to_split_table', 123456789);
INSERT INTO to_split_table VALUES (123456789, 1); INSERT INTO to_split_table VALUES (123456789, 1);
get_shard_id_for_distribution_column get_shard_id_for_distribution_column
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -424,7 +424,7 @@ step s1-begin:
SET citus.select_opens_transaction_block TO false; SET citus.select_opens_transaction_block TO false;
step s1-select: step s1-select:
SELECT count(*) FROM to_split_table WHERE id = 123456789; SELECT count(*) FROM to_split_table WHERE id = 123456789;
count count
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -432,14 +432,14 @@ count
(1 row) (1 row)
step s2-begin: step s2-begin:
BEGIN; BEGIN;
step s2-blocking-shard-split: step s2-blocking-shard-split:
SELECT pg_catalog.citus_split_shard_by_split_points( SELECT pg_catalog.citus_split_shard_by_split_points(
1500002, 1500002,
ARRAY['1073741824'], ARRAY['1073741824'],
ARRAY[1, 2], ARRAY[1, 2],
'block_writes'); 'block_writes');
citus_split_shard_by_split_points citus_split_shard_by_split_points
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -447,26 +447,26 @@ citus_split_shard_by_split_points
(1 row) (1 row)
step s1-delete: step s1-delete:
DELETE FROM to_split_table WHERE id = 123456789; DELETE FROM to_split_table WHERE id = 123456789;
<waiting ...> <waiting ...>
step s2-commit: step s2-commit:
COMMIT; COMMIT;
step s1-delete: <... completed> step s1-delete: <... completed>
ERROR: could not find valid entry for shard xxxxx ERROR: could not find valid entry for shard xxxxx
step s1-commit: step s1-commit:
COMMIT; COMMIT;
step s2-print-cluster: step s2-print-cluster:
-- row count per shard -- row count per shard
SELECT SELECT
nodeport, shardid, success, result nodeport, shardid, success, result
FROM FROM
run_command_on_placements('to_split_table', 'select count(*) from %s') run_command_on_placements('to_split_table', 'select count(*) from %s')
ORDER BY ORDER BY
nodeport, shardid; nodeport, shardid;
-- rows -- rows
SELECT id, value FROM to_split_table ORDER BY id, value; SELECT id, value FROM to_split_table ORDER BY id, value;
nodeport|shardid|success|result nodeport|shardid|success|result
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -494,7 +494,7 @@ step s1-begin:
SET citus.select_opens_transaction_block TO false; SET citus.select_opens_transaction_block TO false;
step s1-select: step s1-select:
SELECT count(*) FROM to_split_table WHERE id = 123456789; SELECT count(*) FROM to_split_table WHERE id = 123456789;
count count
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -502,14 +502,14 @@ count
(1 row) (1 row)
step s2-begin: step s2-begin:
BEGIN; BEGIN;
step s2-blocking-shard-split: step s2-blocking-shard-split:
SELECT pg_catalog.citus_split_shard_by_split_points( SELECT pg_catalog.citus_split_shard_by_split_points(
1500002, 1500002,
ARRAY['1073741824'], ARRAY['1073741824'],
ARRAY[1, 2], ARRAY[1, 2],
'block_writes'); 'block_writes');
citus_split_shard_by_split_points citus_split_shard_by_split_points
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -517,12 +517,12 @@ citus_split_shard_by_split_points
(1 row) (1 row)
step s1-insert: step s1-insert:
-- Id '123456789' maps to shard xxxxx. -- Id '123456789' maps to shard xxxxx.
SELECT get_shard_id_for_distribution_column('to_split_table', 123456789); SELECT get_shard_id_for_distribution_column('to_split_table', 123456789);
INSERT INTO to_split_table VALUES (123456789, 1); INSERT INTO to_split_table VALUES (123456789, 1);
<waiting ...> <waiting ...>
step s2-commit: step s2-commit:
COMMIT; COMMIT;
step s1-insert: <... completed> step s1-insert: <... completed>
get_shard_id_for_distribution_column get_shard_id_for_distribution_column
@ -532,18 +532,18 @@ get_shard_id_for_distribution_column
ERROR: could not find valid entry for shard xxxxx ERROR: could not find valid entry for shard xxxxx
step s1-commit: step s1-commit:
COMMIT; COMMIT;
step s2-print-cluster: step s2-print-cluster:
-- row count per shard -- row count per shard
SELECT SELECT
nodeport, shardid, success, result nodeport, shardid, success, result
FROM FROM
run_command_on_placements('to_split_table', 'select count(*) from %s') run_command_on_placements('to_split_table', 'select count(*) from %s')
ORDER BY ORDER BY
nodeport, shardid; nodeport, shardid;
-- rows -- rows
SELECT id, value FROM to_split_table ORDER BY id, value; SELECT id, value FROM to_split_table ORDER BY id, value;
nodeport|shardid|success|result nodeport|shardid|success|result
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -570,7 +570,7 @@ step s1-begin:
SET citus.select_opens_transaction_block TO false; SET citus.select_opens_transaction_block TO false;
step s1-select: step s1-select:
SELECT count(*) FROM to_split_table WHERE id = 123456789; SELECT count(*) FROM to_split_table WHERE id = 123456789;
count count
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -578,14 +578,14 @@ count
(1 row) (1 row)
step s2-begin: step s2-begin:
BEGIN; BEGIN;
step s2-blocking-shard-split: step s2-blocking-shard-split:
SELECT pg_catalog.citus_split_shard_by_split_points( SELECT pg_catalog.citus_split_shard_by_split_points(
1500002, 1500002,
ARRAY['1073741824'], ARRAY['1073741824'],
ARRAY[1, 2], ARRAY[1, 2],
'block_writes'); 'block_writes');
citus_split_shard_by_split_points citus_split_shard_by_split_points
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -593,26 +593,26 @@ citus_split_shard_by_split_points
(1 row) (1 row)
step s1-copy: step s1-copy:
COPY to_split_table FROM PROGRAM 'echo "1,1\n2,2\n3,3\n4,4\n5,5"' WITH CSV; COPY to_split_table FROM PROGRAM 'echo "1,1\n2,2\n3,3\n4,4\n5,5"' WITH CSV;
<waiting ...> <waiting ...>
step s2-commit: step s2-commit:
COMMIT; COMMIT;
step s1-copy: <... completed> step s1-copy: <... completed>
ERROR: could not find valid entry for shard xxxxx ERROR: could not find valid entry for shard xxxxx
step s1-commit: step s1-commit:
COMMIT; COMMIT;
step s2-print-cluster: step s2-print-cluster:
-- row count per shard -- row count per shard
SELECT SELECT
nodeport, shardid, success, result nodeport, shardid, success, result
FROM FROM
run_command_on_placements('to_split_table', 'select count(*) from %s') run_command_on_placements('to_split_table', 'select count(*) from %s')
ORDER BY ORDER BY
nodeport, shardid; nodeport, shardid;
-- rows -- rows
SELECT id, value FROM to_split_table ORDER BY id, value; SELECT id, value FROM to_split_table ORDER BY id, value;
nodeport|shardid|success|result nodeport|shardid|success|result
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -633,13 +633,13 @@ create_distributed_table
(1 row) (1 row)
step s1-load-cache: step s1-load-cache:
-- Indirect way to load cache. -- Indirect way to load cache.
TRUNCATE to_split_table; TRUNCATE to_split_table;
step s1-insert: step s1-insert:
-- Id '123456789' maps to shard xxxxx. -- Id '123456789' maps to shard xxxxx.
SELECT get_shard_id_for_distribution_column('to_split_table', 123456789); SELECT get_shard_id_for_distribution_column('to_split_table', 123456789);
INSERT INTO to_split_table VALUES (123456789, 1); INSERT INTO to_split_table VALUES (123456789, 1);
get_shard_id_for_distribution_column get_shard_id_for_distribution_column
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -653,11 +653,11 @@ step s1-begin:
SET citus.select_opens_transaction_block TO false; SET citus.select_opens_transaction_block TO false;
step s1-blocking-shard-split: step s1-blocking-shard-split:
SELECT pg_catalog.citus_split_shard_by_split_points( SELECT pg_catalog.citus_split_shard_by_split_points(
1500001, 1500001,
ARRAY['-1073741824'], ARRAY['-1073741824'],
ARRAY[1, 2], ARRAY[1, 2],
'block_writes'); 'block_writes');
citus_split_shard_by_split_points citus_split_shard_by_split_points
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -665,39 +665,33 @@ citus_split_shard_by_split_points
(1 row) (1 row)
step s2-blocking-shard-split: step s2-blocking-shard-split:
SELECT pg_catalog.citus_split_shard_by_split_points( SELECT pg_catalog.citus_split_shard_by_split_points(
1500002, 1500002,
ARRAY['1073741824'], ARRAY['1073741824'],
ARRAY[1, 2], ARRAY[1, 2],
'block_writes'); 'block_writes');
<waiting ...>
step s1-commit:
COMMIT;
step s2-blocking-shard-split: <... completed> ERROR: could not acquire the lock required to split public.to_split_table
citus_split_shard_by_split_points step s1-commit:
--------------------------------------------------------------------- COMMIT;
(1 row)
step s2-print-cluster: step s2-print-cluster:
-- row count per shard -- row count per shard
SELECT SELECT
nodeport, shardid, success, result nodeport, shardid, success, result
FROM FROM
run_command_on_placements('to_split_table', 'select count(*) from %s') run_command_on_placements('to_split_table', 'select count(*) from %s')
ORDER BY ORDER BY
nodeport, shardid; nodeport, shardid;
-- rows -- rows
SELECT id, value FROM to_split_table ORDER BY id, value; SELECT id, value FROM to_split_table ORDER BY id, value;
nodeport|shardid|success|result nodeport|shardid|success|result
--------------------------------------------------------------------- ---------------------------------------------------------------------
57637|1500003|t | 0 57637|1500003|t | 0
57637|1500005|t | 1 57638|1500002|t | 1
57638|1500004|t | 0 57638|1500004|t | 0
57638|1500006|t | 0 (3 rows)
(4 rows)
id|value id|value
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -712,9 +706,9 @@ create_distributed_table
(1 row) (1 row)
step s1-insert: step s1-insert:
-- Id '123456789' maps to shard xxxxx. -- Id '123456789' maps to shard xxxxx.
SELECT get_shard_id_for_distribution_column('to_split_table', 123456789); SELECT get_shard_id_for_distribution_column('to_split_table', 123456789);
INSERT INTO to_split_table VALUES (123456789, 1); INSERT INTO to_split_table VALUES (123456789, 1);
get_shard_id_for_distribution_column get_shard_id_for_distribution_column
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -728,11 +722,11 @@ step s1-begin:
SET citus.select_opens_transaction_block TO false; SET citus.select_opens_transaction_block TO false;
step s1-blocking-shard-split: step s1-blocking-shard-split:
SELECT pg_catalog.citus_split_shard_by_split_points( SELECT pg_catalog.citus_split_shard_by_split_points(
1500001, 1500001,
ARRAY['-1073741824'], ARRAY['-1073741824'],
ARRAY[1, 2], ARRAY[1, 2],
'block_writes'); 'block_writes');
citus_split_shard_by_split_points citus_split_shard_by_split_points
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -740,39 +734,33 @@ citus_split_shard_by_split_points
(1 row) (1 row)
step s2-blocking-shard-split: step s2-blocking-shard-split:
SELECT pg_catalog.citus_split_shard_by_split_points( SELECT pg_catalog.citus_split_shard_by_split_points(
1500002, 1500002,
ARRAY['1073741824'], ARRAY['1073741824'],
ARRAY[1, 2], ARRAY[1, 2],
'block_writes'); 'block_writes');
<waiting ...>
step s1-commit:
COMMIT;
step s2-blocking-shard-split: <... completed> ERROR: could not acquire the lock required to split public.to_split_table
citus_split_shard_by_split_points step s1-commit:
--------------------------------------------------------------------- COMMIT;
(1 row)
step s2-print-cluster: step s2-print-cluster:
-- row count per shard -- row count per shard
SELECT SELECT
nodeport, shardid, success, result nodeport, shardid, success, result
FROM FROM
run_command_on_placements('to_split_table', 'select count(*) from %s') run_command_on_placements('to_split_table', 'select count(*) from %s')
ORDER BY ORDER BY
nodeport, shardid; nodeport, shardid;
-- rows -- rows
SELECT id, value FROM to_split_table ORDER BY id, value; SELECT id, value FROM to_split_table ORDER BY id, value;
nodeport|shardid|success|result nodeport|shardid|success|result
--------------------------------------------------------------------- ---------------------------------------------------------------------
57637|1500003|t | 0 57637|1500003|t | 0
57637|1500005|t | 1 57638|1500002|t | 1
57638|1500004|t | 0 57638|1500004|t | 0
57638|1500006|t | 0 (3 rows)
(4 rows)
id|value id|value
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -787,8 +775,8 @@ create_distributed_table
(1 row) (1 row)
step s1-load-cache: step s1-load-cache:
-- Indirect way to load cache. -- Indirect way to load cache.
TRUNCATE to_split_table; TRUNCATE to_split_table;
step s1-begin: step s1-begin:
BEGIN; BEGIN;
@ -797,7 +785,7 @@ step s1-begin:
SET citus.select_opens_transaction_block TO false; SET citus.select_opens_transaction_block TO false;
step s1-select: step s1-select:
SELECT count(*) FROM to_split_table WHERE id = 123456789; SELECT count(*) FROM to_split_table WHERE id = 123456789;
count count
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -805,14 +793,14 @@ count
(1 row) (1 row)
step s2-begin: step s2-begin:
BEGIN; BEGIN;
step s2-blocking-shard-split: step s2-blocking-shard-split:
SELECT pg_catalog.citus_split_shard_by_split_points( SELECT pg_catalog.citus_split_shard_by_split_points(
1500002, 1500002,
ARRAY['1073741824'], ARRAY['1073741824'],
ARRAY[1, 2], ARRAY[1, 2],
'block_writes'); 'block_writes');
citus_split_shard_by_split_points citus_split_shard_by_split_points
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -820,25 +808,25 @@ citus_split_shard_by_split_points
(1 row) (1 row)
step s1-ddl: step s1-ddl:
CREATE INDEX test_table_index ON to_split_table(id); CREATE INDEX test_table_index ON to_split_table(id);
<waiting ...> <waiting ...>
step s2-commit: step s2-commit:
COMMIT; COMMIT;
step s1-ddl: <... completed> step s1-ddl: <... completed>
step s1-commit: step s1-commit:
COMMIT; COMMIT;
step s2-print-cluster: step s2-print-cluster:
-- row count per shard -- row count per shard
SELECT SELECT
nodeport, shardid, success, result nodeport, shardid, success, result
FROM FROM
run_command_on_placements('to_split_table', 'select count(*) from %s') run_command_on_placements('to_split_table', 'select count(*) from %s')
ORDER BY ORDER BY
nodeport, shardid; nodeport, shardid;
-- rows -- rows
SELECT id, value FROM to_split_table ORDER BY id, value; SELECT id, value FROM to_split_table ORDER BY id, value;
nodeport|shardid|success|result nodeport|shardid|success|result
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -852,12 +840,12 @@ id|value
(0 rows) (0 rows)
step s2-print-index-count: step s2-print-index-count:
SELECT SELECT
nodeport, success, result nodeport, success, result
FROM FROM
run_command_on_placements('to_split_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''') run_command_on_placements('to_split_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''')
ORDER BY ORDER BY
nodeport; nodeport;
nodeport|success|result nodeport|success|result
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -880,7 +868,7 @@ step s1-begin:
SET citus.select_opens_transaction_block TO false; SET citus.select_opens_transaction_block TO false;
step s1-select: step s1-select:
SELECT count(*) FROM to_split_table WHERE id = 123456789; SELECT count(*) FROM to_split_table WHERE id = 123456789;
count count
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -888,14 +876,14 @@ count
(1 row) (1 row)
step s2-begin: step s2-begin:
BEGIN; BEGIN;
step s2-blocking-shard-split: step s2-blocking-shard-split:
SELECT pg_catalog.citus_split_shard_by_split_points( SELECT pg_catalog.citus_split_shard_by_split_points(
1500002, 1500002,
ARRAY['1073741824'], ARRAY['1073741824'],
ARRAY[1, 2], ARRAY[1, 2],
'block_writes'); 'block_writes');
citus_split_shard_by_split_points citus_split_shard_by_split_points
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -903,25 +891,25 @@ citus_split_shard_by_split_points
(1 row) (1 row)
step s1-ddl: step s1-ddl:
CREATE INDEX test_table_index ON to_split_table(id); CREATE INDEX test_table_index ON to_split_table(id);
<waiting ...> <waiting ...>
step s2-commit: step s2-commit:
COMMIT; COMMIT;
step s1-ddl: <... completed> step s1-ddl: <... completed>
step s1-commit: step s1-commit:
COMMIT; COMMIT;
step s2-print-cluster: step s2-print-cluster:
-- row count per shard -- row count per shard
SELECT SELECT
nodeport, shardid, success, result nodeport, shardid, success, result
FROM FROM
run_command_on_placements('to_split_table', 'select count(*) from %s') run_command_on_placements('to_split_table', 'select count(*) from %s')
ORDER BY ORDER BY
nodeport, shardid; nodeport, shardid;
-- rows -- rows
SELECT id, value FROM to_split_table ORDER BY id, value; SELECT id, value FROM to_split_table ORDER BY id, value;
nodeport|shardid|success|result nodeport|shardid|success|result
--------------------------------------------------------------------- ---------------------------------------------------------------------
@ -935,12 +923,12 @@ id|value
(0 rows) (0 rows)
step s2-print-index-count: step s2-print-index-count:
SELECT SELECT
nodeport, success, result nodeport, success, result
FROM FROM
run_command_on_placements('to_split_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''') run_command_on_placements('to_split_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''')
ORDER BY ORDER BY
nodeport; nodeport;
nodeport|success|result nodeport|success|result
--------------------------------------------------------------------- ---------------------------------------------------------------------

55
src/test/regress/expected/isolation_concurrent_move_create_table.out
View File

@ -1,11 +1,6 @@
Parsed test spec with 5 sessions Parsed test spec with 5 sessions
starting permutation: s2-begin s2-create_distributed_table s3-create_distributed_table s2-commit starting permutation: s2-begin s2-create_distributed_table s3-create_distributed_table s2-commit
create_distributed_table
---------------------------------------------------------------------
(1 row)
step s2-begin: step s2-begin:
BEGIN; BEGIN;
@ -30,11 +25,6 @@ step s2-commit:
starting permutation: s2-begin s2-create_distributed_table s1-move-shard-logical s2-commit s3-sanity-check s3-sanity-check-2 starting permutation: s2-begin s2-create_distributed_table s1-move-shard-logical s2-commit s3-sanity-check s3-sanity-check-2
create_distributed_table
---------------------------------------------------------------------
(1 row)
step s2-begin: step s2-begin:
BEGIN; BEGIN;
@ -72,11 +62,6 @@ count
starting permutation: s2-begin s2-create_distributed_table s1-move-shard-block s2-commit s3-sanity-check s3-sanity-check-2 starting permutation: s2-begin s2-create_distributed_table s1-move-shard-block s2-commit s3-sanity-check s3-sanity-check-2
create_distributed_table
---------------------------------------------------------------------
(1 row)
step s2-begin: step s2-begin:
BEGIN; BEGIN;
@ -113,12 +98,45 @@ count
(1 row) (1 row)
starting permutation: s4-begin s4-move-shard-logical s5-setup-rep-factor s5-create_implicit_colocated_distributed_table s4-commit s3-sanity-check s3-sanity-check-3 s3-sanity-check-4 starting permutation: s2-begin s2-create_distributed_table s1-split-block s2-commit s3-sanity-check s3-sanity-check-2
step s2-begin:
BEGIN;
step s2-create_distributed_table:
SELECT create_distributed_table('concurrent_table_2', 'id', colocate_with := 'concurrent_table_1');
create_distributed_table create_distributed_table
--------------------------------------------------------------------- ---------------------------------------------------------------------
(1 row) (1 row)
step s1-split-block:
WITH shardid AS (SELECT shardid FROM pg_dist_shard where logicalrelid = 'concurrent_table_1'::regclass ORDER BY shardid LIMIT 1)
SELECT citus_split_shard_by_split_points(
shardid.shardid, ARRAY['2113265921'], ARRAY[(SELECT * FROM first_node_id), (SELECT * FROM first_node_id)], 'block_writes') FROM shardid;
ERROR: could not acquire the lock required to split public.concurrent_table_1
step s2-commit:
COMMIT;
step s3-sanity-check:
SELECT count(*) FROM pg_dist_shard LEFT JOIN pg_dist_shard_placement USING(shardid) WHERE nodename IS NULL;
count
---------------------------------------------------------------------
0
(1 row)
step s3-sanity-check-2:
SELECT count(*) FROM concurrent_table_1 JOIN concurrent_table_2 USING (id);
count
---------------------------------------------------------------------
0
(1 row)
starting permutation: s4-begin s4-move-shard-logical s5-setup-rep-factor s5-create_implicit_colocated_distributed_table s4-commit s3-sanity-check s3-sanity-check-3 s3-sanity-check-4
step s4-begin: step s4-begin:
BEGIN; BEGIN;
@ -167,11 +185,6 @@ count
starting permutation: s4-begin s4-move-shard-block s5-setup-rep-factor s5-create_implicit_colocated_distributed_table s4-commit s3-sanity-check s3-sanity-check-3 s3-sanity-check-4 starting permutation: s4-begin s4-move-shard-block s5-setup-rep-factor s5-create_implicit_colocated_distributed_table s4-commit s3-sanity-check s3-sanity-check-3 s3-sanity-check-4
create_distributed_table
---------------------------------------------------------------------
(1 row)
step s4-begin: step s4-begin:
BEGIN; BEGIN;

30
src/test/regress/spec/isolation_blocking_shard_split.spec
View File

@ -125,22 +125,22 @@ step "s2-print-index-count"
// Run shard split while concurrently performing DML and index creation // Run shard split while concurrently performing DML and index creation
// We expect DML,Copy to fail because the shard they are waiting for is destroyed. // We expect DML,Copy to fail because the shard they are waiting for is destroyed.
permutation "s1-load-cache" "s1-insert" "s1-begin" "s1-select" "s2-begin" "s2-blocking-shard-split" "s1-update" "s2-commit" "s1-commit" "s2-print-cluster" permutation "s1-load-cache" "s1-insert" "s1-begin" "s1-select" "s2-begin" "s2-blocking-shard-split" "s1-update" "s2-commit" "s1-commit" "s2-print-cluster"
permutation "s1-load-cache" "s1-insert" "s1-begin" "s1-select" "s2-begin" "s2-blocking-shard-split" "s1-delete" "s2-commit" "s1-commit" "s2-print-cluster" permutation "s1-load-cache" "s1-insert" "s1-begin" "s1-select" "s2-begin" "s2-blocking-shard-split" "s1-delete" "s2-commit" "s1-commit" "s2-print-cluster"
permutation "s1-load-cache" "s1-begin" "s1-select" "s2-begin" "s2-blocking-shard-split" "s1-insert" "s2-commit" "s1-commit" "s2-print-cluster" permutation "s1-load-cache" "s1-begin" "s1-select" "s2-begin" "s2-blocking-shard-split" "s1-insert" "s2-commit" "s1-commit" "s2-print-cluster"
permutation "s1-load-cache" "s1-begin" "s1-select" "s2-begin" "s2-blocking-shard-split" "s1-copy" "s2-commit" "s1-commit" "s2-print-cluster" permutation "s1-load-cache" "s1-begin" "s1-select" "s2-begin" "s2-blocking-shard-split" "s1-copy" "s2-commit" "s1-commit" "s2-print-cluster"
// The same tests without loading the cache at first // The same tests without loading the cache at first
permutation "s1-insert" "s1-begin" "s1-select" "s2-begin" "s2-blocking-shard-split" "s1-update" "s2-commit" "s1-commit" "s2-print-cluster" permutation "s1-insert" "s1-begin" "s1-select" "s2-begin" "s2-blocking-shard-split" "s1-update" "s2-commit" "s1-commit" "s2-print-cluster"
permutation "s1-insert" "s1-begin" "s1-select" "s2-begin" "s2-blocking-shard-split" "s1-delete" "s2-commit" "s1-commit" "s2-print-cluster" permutation "s1-insert" "s1-begin" "s1-select" "s2-begin" "s2-blocking-shard-split" "s1-delete" "s2-commit" "s1-commit" "s2-print-cluster"
permutation "s1-begin" "s1-select" "s2-begin" "s2-blocking-shard-split" "s1-insert" "s2-commit" "s1-commit" "s2-print-cluster" permutation "s1-begin" "s1-select" "s2-begin" "s2-blocking-shard-split" "s1-insert" "s2-commit" "s1-commit" "s2-print-cluster"
permutation "s1-begin" "s1-select" "s2-begin" "s2-blocking-shard-split" "s1-copy" "s2-commit" "s1-commit" "s2-print-cluster" permutation "s1-begin" "s1-select" "s2-begin" "s2-blocking-shard-split" "s1-copy" "s2-commit" "s1-commit" "s2-print-cluster"
// Concurrent shard split blocks on different shards of the same table (or any colocated table) // Concurrent shard split blocks on different shards of the same table (or any colocated table)
permutation "s1-load-cache" "s1-insert" "s1-begin" "s1-blocking-shard-split" "s2-blocking-shard-split" "s1-commit" "s2-print-cluster" permutation "s1-load-cache" "s1-insert" "s1-begin" "s1-blocking-shard-split" "s2-blocking-shard-split" "s1-commit" "s2-print-cluster"
// The same test above without loading the cache at first // The same test above without loading the cache at first
permutation "s1-insert" "s1-begin" "s1-blocking-shard-split" "s2-blocking-shard-split" "s1-commit" "s2-print-cluster" permutation "s1-insert" "s1-begin" "s1-blocking-shard-split" "s2-blocking-shard-split" "s1-commit" "s2-print-cluster"
// Concurrent DDL blocks on different shards of the same table (or any colocated table) // Concurrent DDL blocks on different shards of the same table (or any colocated table)
permutation "s1-load-cache" "s1-begin" "s1-select" "s2-begin" "s2-blocking-shard-split" "s1-ddl" "s2-commit" "s1-commit" "s2-print-cluster" "s2-print-index-count" permutation "s1-load-cache" "s1-begin" "s1-select" "s2-begin" "s2-blocking-shard-split" "s1-ddl" "s2-commit" "s1-commit" "s2-print-cluster" "s2-print-index-count"
// The same tests without loading the cache at first // The same tests without loading the cache at first
permutation "s1-begin" "s1-select" "s2-begin" "s2-blocking-shard-split" "s1-ddl" "s2-commit" "s1-commit" "s2-print-cluster" "s2-print-index-count" permutation "s1-begin" "s1-select" "s2-begin" "s2-blocking-shard-split" "s1-ddl" "s2-commit" "s1-commit" "s2-print-cluster" "s2-print-index-count"

13
src/test/regress/spec/isolation_concurrent_move_create_table.spec
View File

@ -9,11 +9,13 @@ setup
SET citus.shard_replication_factor TO 1; SET citus.shard_replication_factor TO 1;
SELECT create_distributed_table('concurrent_table_1', 'id', colocate_with := 'none'); SELECT create_distributed_table('concurrent_table_1', 'id', colocate_with := 'none');
SELECT create_distributed_table('concurrent_table_4', 'id'); SELECT create_distributed_table('concurrent_table_4', 'id');
SELECT nodeid INTO first_node_id FROM pg_dist_node WHERE nodeport = 57637;
} }
teardown teardown
{ {
DROP TABLE concurrent_table_1, concurrent_table_2, concurrent_table_3, concurrent_table_4, concurrent_table_5 CASCADE; DROP TABLE concurrent_table_1, concurrent_table_2, concurrent_table_3, concurrent_table_4, concurrent_table_5, first_node_id CASCADE;
} }
session "s1" session "s1"
@ -31,6 +33,14 @@ step "s1-move-shard-block"
SELECT citus_move_Shard_placement(shardid.shardid, 'localhost', 57637, 'localhost', 57638, 'block_writes') FROM shardid; SELECT citus_move_Shard_placement(shardid.shardid, 'localhost', 57637, 'localhost', 57638, 'block_writes') FROM shardid;
} }
step "s1-split-block"
{
WITH shardid AS (SELECT shardid FROM pg_dist_shard where logicalrelid = 'concurrent_table_1'::regclass ORDER BY shardid LIMIT 1)
SELECT citus_split_shard_by_split_points(
shardid.shardid, ARRAY['2113265921'], ARRAY[(SELECT * FROM first_node_id), (SELECT * FROM first_node_id)], 'block_writes') FROM shardid;
}
session "s2" session "s2"
step "s2-begin" step "s2-begin"
@ -119,6 +129,7 @@ permutation "s2-begin" "s2-create_distributed_table" "s3-create_distributed_tab
// concurrent create colocated table and shard move properly block each other, and cluster is healthy // concurrent create colocated table and shard move properly block each other, and cluster is healthy
permutation "s2-begin" "s2-create_distributed_table" "s1-move-shard-logical" "s2-commit" "s3-sanity-check" "s3-sanity-check-2" permutation "s2-begin" "s2-create_distributed_table" "s1-move-shard-logical" "s2-commit" "s3-sanity-check" "s3-sanity-check-2"
permutation "s2-begin" "s2-create_distributed_table" "s1-move-shard-block" "s2-commit" "s3-sanity-check" "s3-sanity-check-2" permutation "s2-begin" "s2-create_distributed_table" "s1-move-shard-block" "s2-commit" "s3-sanity-check" "s3-sanity-check-2"
permutation "s2-begin" "s2-create_distributed_table" "s1-split-block" "s2-commit" "s3-sanity-check" "s3-sanity-check-2"
// same test above, but this time implicitly colocated tables // same test above, but this time implicitly colocated tables
permutation "s4-begin" "s4-move-shard-logical" "s5-setup-rep-factor" "s5-create_implicit_colocated_distributed_table" "s4-commit" "s3-sanity-check" "s3-sanity-check-3" "s3-sanity-check-4" permutation "s4-begin" "s4-move-shard-logical" "s5-setup-rep-factor" "s5-create_implicit_colocated_distributed_table" "s4-commit" "s3-sanity-check" "s3-sanity-check-3" "s3-sanity-check-4"