From 13c7c1ad6dffc35e9db428d7205ba4ca551422fc Mon Sep 17 00:00:00 2001 From: Halil Ozan Akgul Date: Tue, 24 Mar 2020 17:06:38 +0300 Subject: [PATCH] Reverts failure tests sqls --- src/test/regress/sql/failure_add_disable_node.sql | 6 +++--- src/test/regress/sql/failure_distributed_results.sql | 6 +++--- src/test/regress/sql/failure_setup.sql | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/regress/sql/failure_add_disable_node.sql b/src/test/regress/sql/failure_add_disable_node.sql index 3f54390a0..716710d84 100644 --- a/src/test/regress/sql/failure_add_disable_node.sql +++ b/src/test/regress/sql/failure_add_disable_node.sql @@ -155,16 +155,16 @@ WHERE s.logicalrelid = 'user_table'::regclass ORDER BY placementid; -- fail master_add_node by failing copy out operation -SELECT master_remove_node(:'worker_1_host', :worker_1_port); +SELECT master_remove_node('localhost', :worker_1_port); SELECT citus.mitmproxy('conn.onQuery(query="COPY").kill()'); -SELECT master_add_node(:'worker_1_host', :worker_1_port); +SELECT master_add_node('localhost', :worker_1_port); -- verify node is not added SELECT * FROM master_get_active_worker_nodes() ORDER BY 1, 2; SELECT citus.mitmproxy('conn.allow()'); -SELECT master_add_node(:'worker_1_host', :worker_1_port); +SELECT master_add_node('localhost', :worker_1_port); -- verify node is added SELECT * FROM master_get_active_worker_nodes() diff --git a/src/test/regress/sql/failure_distributed_results.sql b/src/test/regress/sql/failure_distributed_results.sql index b77787d30..6f6e12805 100644 --- a/src/test/regress/sql/failure_distributed_results.sql +++ b/src/test/regress/sql/failure_distributed_results.sql @@ -42,7 +42,7 @@ CREATE TABLE distributed_result_info AS FROM partition_task_list_results('test', $$ SELECT * FROM source_table $$, 'target_table') NATURAL JOIN pg_dist_node; SELECT * FROM distributed_result_info ORDER BY resultId; -SELECT fetch_intermediate_results('{test_from_100802_to_1,test_from_100802_to_2}'::text[], :'worker_2_host', :worker_2_port) > 0 AS fetched; +SELECT fetch_intermediate_results('{test_from_100802_to_1,test_from_100802_to_2}'::text[], 'localhost', :worker_2_port) > 0 AS fetched; SELECT count(*), sum(x) FROM read_intermediate_results('{test_from_100802_to_1,test_from_100802_to_2}'::text[],'binary') AS res (x int); ROLLBACk; @@ -57,10 +57,10 @@ CREATE TABLE distributed_result_info AS SELECT * FROM distributed_result_info ORDER BY resultId; -- fetch from worker 2 should fail SAVEPOINT s1; -SELECT fetch_intermediate_results('{test_from_100802_to_1,test_from_100802_to_2}'::text[], :'worker_2_host', :worker_2_port) > 0 AS fetched; +SELECT fetch_intermediate_results('{test_from_100802_to_1,test_from_100802_to_2}'::text[], 'localhost', :worker_2_port) > 0 AS fetched; ROLLBACK TO SAVEPOINT s1; -- fetch from worker 1 should succeed -SELECT fetch_intermediate_results('{test_from_100802_to_1,test_from_100802_to_2}'::text[], :'worker_1_host', :worker_1_port) > 0 AS fetched; +SELECT fetch_intermediate_results('{test_from_100802_to_1,test_from_100802_to_2}'::text[], 'localhost', :worker_1_port) > 0 AS fetched; -- make sure the results read are same as the previous transaction block SELECT count(*), sum(x) FROM read_intermediate_results('{test_from_100802_to_1,test_from_100802_to_2}'::text[],'binary') AS res (x int); diff --git a/src/test/regress/sql/failure_setup.sql b/src/test/regress/sql/failure_setup.sql index 4235744eb..4c209f14d 100644 --- a/src/test/regress/sql/failure_setup.sql +++ b/src/test/regress/sql/failure_setup.sql @@ -1,5 +1,5 @@ SELECT citus.mitmproxy('conn.allow()'); -- add the workers -SELECT master_add_node(:'worker_1_host', :worker_1_port); +SELECT master_add_node('localhost', :worker_1_port); SELECT master_add_node('localhost', :worker_2_proxy_port); -- an mitmproxy which forwards to the second worker