From 3ff46245b30e7bcc3365dcd9655d40aac51cd425 Mon Sep 17 00:00:00 2001 From: Marco Slot Date: Tue, 15 Aug 2017 11:40:43 +0200 Subject: [PATCH] Make sure we don't use 2PC in copy from worker --- src/test/regress/input/multi_copy.source | 5 +++++ src/test/regress/output/multi_copy.source | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/test/regress/input/multi_copy.source b/src/test/regress/input/multi_copy.source index 656855d43..13714446e 100644 --- a/src/test/regress/input/multi_copy.source +++ b/src/test/regress/input/multi_copy.source @@ -352,7 +352,12 @@ SELECT master_create_distributed_table('customer_worker_copy_append', 'c_custkey -- Test copy from the worker node COPY customer_worker_copy_append FROM '@abs_srcdir@/data/customer.1.data' with (delimiter '|', master_host 'localhost', master_port 57636); + +-- Make sure we don't use 2PC when connecting to master, even if requested +BEGIN; +SET LOCAL citus.multi_shard_commit_protocol TO '2pc'; COPY customer_worker_copy_append FROM '@abs_srcdir@/data/customer.2.data' with (delimiter '|', master_host 'localhost', master_port 57636); +COMMIT; -- Test if there is no relation to copy data with the worker copy COPY lineitem_copy_none FROM '@abs_srcdir@/data/lineitem.1.data' with (delimiter '|', master_host 'localhost', master_port 57636); diff --git a/src/test/regress/output/multi_copy.source b/src/test/regress/output/multi_copy.source index d44a614af..498b7dbed 100644 --- a/src/test/regress/output/multi_copy.source +++ b/src/test/regress/output/multi_copy.source @@ -468,7 +468,11 @@ HINT: Consider using hash partitioning. \c - - - 57637 -- Test copy from the worker node COPY customer_worker_copy_append FROM '@abs_srcdir@/data/customer.1.data' with (delimiter '|', master_host 'localhost', master_port 57636); +-- Make sure we don't use 2PC when connecting to master, even if requested +BEGIN; +SET LOCAL citus.multi_shard_commit_protocol TO '2pc'; COPY customer_worker_copy_append FROM '@abs_srcdir@/data/customer.2.data' with (delimiter '|', master_host 'localhost', master_port 57636); +COMMIT; -- Test if there is no relation to copy data with the worker copy COPY lineitem_copy_none FROM '@abs_srcdir@/data/lineitem.1.data' with (delimiter '|', master_host 'localhost', master_port 57636); WARNING: relation "lineitem_copy_none" does not exist