From 1d7dde2c4c08db3c3c6a7fc7a21c94d27dfaa8fc Mon Sep 17 00:00:00 2001
From: Halil Ozan Akgul <hozanakgul@gmail.com>
Date: Tue, 14 Dec 2021 10:48:19 +0300
Subject: [PATCH] Fix metadata sync fails on multi_copy

---
 src/test/regress/input/multi_copy.source  | 16 ----------------
 src/test/regress/multi_1_schedule         |  3 +--
 src/test/regress/output/multi_copy.source |  3 ---
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/test/regress/input/multi_copy.source b/src/test/regress/input/multi_copy.source
index 19be89a25..856f886b5 100644
--- a/src/test/regress/input/multi_copy.source
+++ b/src/test/regress/input/multi_copy.source
@@ -577,15 +577,6 @@ ALTER USER test_user WITH nologin;
 
 -- reissue copy, and it should fail
 COPY numbers_hash FROM STDIN WITH (FORMAT 'csv');
-1,1
-2,2
-3,3
-4,4
-5,5
-6,6
-7,7
-8,8
-\.
 
 -- verify shards in the none of the workers as marked invalid
 SELECT shardid, shardstate, nodename, nodeport
@@ -594,9 +585,6 @@ SELECT shardid, shardstate, nodename, nodeport
 
 -- try to insert into a reference table copy should fail
 COPY numbers_reference FROM STDIN WITH (FORMAT 'csv');
-3,1
-4,2
-\.
 
 -- verify shards for reference table are still valid
 SELECT shardid, shardstate, nodename, nodeport
@@ -608,10 +596,6 @@ SELECT shardid, shardstate, nodename, nodeport
 -- since it can not insert into either copies of a shard. shards are expected to
 -- stay valid since the operation is rolled back.
 COPY numbers_hash_other FROM STDIN WITH (FORMAT 'csv');
-1,1
-2,2
-3,3
-\.
 
 -- verify shards for numbers_hash_other are still valid
 -- since copy has failed altogether
diff --git a/src/test/regress/multi_1_schedule b/src/test/regress/multi_1_schedule
index 7670fb789..e82db0161 100644
--- a/src/test/regress/multi_1_schedule
+++ b/src/test/regress/multi_1_schedule
@@ -197,7 +197,6 @@ test: multi_index_statements
 test: multi_generate_ddl_commands multi_repair_shards
 test: multi_create_shards
 test: multi_transaction_recovery
-test: multi_copy
 test: turn_mx_on
 
 test: local_dist_join_modifications
@@ -209,7 +208,7 @@ test: citus_local_dist_joins
 # multi_copy creates hash and range-partitioned tables and performs COPY
 # multi_router_planner creates hash partitioned tables.
 # ---------
-test: fast_path_router_modify pg_dump
+test: multi_copy fast_path_router_modify pg_dump
 test: multi_router_planner
 # These 2 tests have prepared statements which sometimes get invalidated by concurrent tests,
 # changing the debug output. We should not run them in parallel with others
diff --git a/src/test/regress/output/multi_copy.source b/src/test/regress/output/multi_copy.source
index c521acc34..96d80ed97 100644
--- a/src/test/regress/output/multi_copy.source
+++ b/src/test/regress/output/multi_copy.source
@@ -742,7 +742,6 @@ ALTER USER test_user WITH nologin;
 -- reissue copy, and it should fail
 COPY numbers_hash FROM STDIN WITH (FORMAT 'csv');
 ERROR:  connection to the remote node localhost:xxxxx failed with the following error: FATAL:  role "test_user" is not permitted to log in
-CONTEXT:  COPY numbers_hash, line 1: "1,1"
 -- verify shards in the none of the workers as marked invalid
 SELECT shardid, shardstate, nodename, nodeport
 	FROM pg_dist_shard_placement join pg_dist_shard using(shardid)
@@ -762,7 +761,6 @@ SELECT shardid, shardstate, nodename, nodeport
 -- try to insert into a reference table copy should fail
 COPY numbers_reference FROM STDIN WITH (FORMAT 'csv');
 ERROR:  connection to the remote node localhost:xxxxx failed with the following error: FATAL:  role "test_user" is not permitted to log in
-CONTEXT:  COPY numbers_reference, line 1: "3,1"
 -- verify shards for reference table are still valid
 SELECT shardid, shardstate, nodename, nodeport
 	FROM pg_dist_shard_placement join pg_dist_shard using(shardid)
@@ -778,7 +776,6 @@ SELECT shardid, shardstate, nodename, nodeport
 -- stay valid since the operation is rolled back.
 COPY numbers_hash_other FROM STDIN WITH (FORMAT 'csv');
 ERROR:  connection to the remote node localhost:xxxxx failed with the following error: FATAL:  role "test_user" is not permitted to log in
-CONTEXT:  COPY numbers_hash_other, line 1: "1,1"
 -- verify shards for numbers_hash_other are still valid
 -- since copy has failed altogether
 SELECT shardid, shardstate, nodename, nodeport