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

Merge cfea11b137 into 38fea7fe66

pull/1162/merge
Marco Slot 2017-06-08 15:43:33 +00:00 committed by GitHub
parent 38fea7fe66 cfea11b137
commit c482f00264
3 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/distributed/metadata/metadata_sync.c
View File

@ -88,8 +88,6 @@ start_metadata_sync_to_node(PG_FUNCTION_ARGS)
EnsureSuperUser(); EnsureSuperUser();
CheckCitusVersion(ERROR); CheckCitusVersion(ERROR);
PreventTransactionChain(true, "start_metadata_sync_to_node");
workerNode = FindWorkerNode(nodeNameString, nodePort); workerNode = FindWorkerNode(nodeNameString, nodePort);
if (workerNode == NULL) if (workerNode == NULL)

14
src/test/regress/expected/multi_metadata_sync.out
View File

@ -312,6 +312,7 @@ RESET citus.shard_replication_factor;
RESET citus.replication_model; RESET citus.replication_model;
-- Check that repeated calls to start_metadata_sync_to_node has no side effects -- Check that repeated calls to start_metadata_sync_to_node has no side effects
\c - - - :master_port \c - - - :master_port
BEGIN;
SELECT start_metadata_sync_to_node('localhost', :worker_1_port); SELECT start_metadata_sync_to_node('localhost', :worker_1_port);
start_metadata_sync_to_node start_metadata_sync_to_node
----------------------------- -----------------------------
@ -324,6 +325,7 @@ SELECT start_metadata_sync_to_node('localhost', :worker_1_port);
(1 row) (1 row)
COMMIT;
\c - - - :worker_1_port \c - - - :worker_1_port
SELECT * FROM pg_dist_local_group; SELECT * FROM pg_dist_local_group;
groupid groupid
@ -387,18 +389,6 @@ SELECT count(*) FROM pg_trigger WHERE tgrelid='mx_testing_schema.mx_test_table':
1 1
(1 row) (1 row)
-- Make sure that start_metadata_sync_to_node cannot be called inside a transaction
\c - - - :master_port
BEGIN;
SELECT start_metadata_sync_to_node('localhost', :worker_2_port);
ERROR: start_metadata_sync_to_node cannot run inside a transaction block
ROLLBACK;
SELECT hasmetadata FROM pg_dist_node WHERE nodeport=:worker_2_port;
hasmetadata
-------------
f
(1 row)
-- Check that the distributed table can be queried from the worker -- Check that the distributed table can be queried from the worker
\c - - - :master_port \c - - - :master_port
SET citus.shard_replication_factor TO 1; SET citus.shard_replication_factor TO 1;

10
src/test/regress/sql/multi_metadata_sync.sql
View File

@ -118,8 +118,10 @@ RESET citus.replication_model;
-- Check that repeated calls to start_metadata_sync_to_node has no side effects -- Check that repeated calls to start_metadata_sync_to_node has no side effects
\c - - - :master_port \c - - - :master_port
BEGIN;
SELECT start_metadata_sync_to_node('localhost', :worker_1_port); SELECT start_metadata_sync_to_node('localhost', :worker_1_port);
SELECT start_metadata_sync_to_node('localhost', :worker_1_port); SELECT start_metadata_sync_to_node('localhost', :worker_1_port);
COMMIT;
\c - - - :worker_1_port \c - - - :worker_1_port
SELECT * FROM pg_dist_local_group; SELECT * FROM pg_dist_local_group;
SELECT * FROM pg_dist_node ORDER BY nodeid; SELECT * FROM pg_dist_node ORDER BY nodeid;
@ -129,14 +131,6 @@ SELECT * FROM pg_dist_shard_placement ORDER BY shardid, nodename, nodeport;
\d mx_testing_schema.mx_test_table \d mx_testing_schema.mx_test_table
SELECT count(*) FROM pg_trigger WHERE tgrelid='mx_testing_schema.mx_test_table'::regclass; SELECT count(*) FROM pg_trigger WHERE tgrelid='mx_testing_schema.mx_test_table'::regclass;
-- Make sure that start_metadata_sync_to_node cannot be called inside a transaction
\c - - - :master_port
BEGIN;
SELECT start_metadata_sync_to_node('localhost', :worker_2_port);
ROLLBACK;
SELECT hasmetadata FROM pg_dist_node WHERE nodeport=:worker_2_port;
-- Check that the distributed table can be queried from the worker -- Check that the distributed table can be queried from the worker
\c - - - :master_port \c - - - :master_port
SET citus.shard_replication_factor TO 1; SET citus.shard_replication_factor TO 1;