From 28497e2f0e70fcb4d8152b9aadfbadea552a54b4 Mon Sep 17 00:00:00 2001 From: Burak Velioglu Date: Fri, 28 Jan 2022 17:11:15 +0300 Subject: [PATCH] Fix failure tests --- .../regress/expected/failure_mx_metadata_sync.out | 12 ++++++------ src/test/regress/sql/failure_mx_metadata_sync.sql | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/test/regress/expected/failure_mx_metadata_sync.out b/src/test/regress/expected/failure_mx_metadata_sync.out index 0d27cfb48..32af1303e 100644 --- a/src/test/regress/expected/failure_mx_metadata_sync.out +++ b/src/test/regress/expected/failure_mx_metadata_sync.out @@ -75,8 +75,8 @@ ERROR: server closed the connection unexpectedly This probably means the server terminated abnormally before or while processing the request. CONTEXT: while executing command on localhost:xxxxx --- Failure to truncate pg_dist_node in the worker -SELECT citus.mitmproxy('conn.onQuery(query="^TRUNCATE pg_dist_node CASCADE").cancel(' || :pid || ')'); +-- Failure to delete pg_dist_node entries from the worker +SELECT citus.mitmproxy('conn.onQuery(query="^DELETE FROM pg_dist_node").cancel(' || :pid || ')'); mitmproxy --------------------------------------------------------------------- @@ -84,7 +84,7 @@ SELECT citus.mitmproxy('conn.onQuery(query="^TRUNCATE pg_dist_node CASCADE").can SELECT start_metadata_sync_to_node('localhost', :worker_2_proxy_port); ERROR: canceling statement due to user request -SELECT citus.mitmproxy('conn.onQuery(query="^TRUNCATE pg_dist_node CASCADE").kill()'); +SELECT citus.mitmproxy('conn.onQuery(query="^DELETE FROM pg_dist_node").kill()'); mitmproxy --------------------------------------------------------------------- @@ -224,8 +224,8 @@ CONTEXT: while executing command on localhost:xxxxx (1 row) --- Failure to truncate pg_dist_node in the worker -SELECT citus.mitmproxy('conn.onQuery(query="^TRUNCATE pg_dist_node CASCADE").cancel(' || :pid || ')'); +-- Failure to delete pg_dist_node entries from the worker +SELECT citus.mitmproxy('conn.onQuery(query="^DELETE FROM pg_dist_node").cancel(' || :pid || ')'); mitmproxy --------------------------------------------------------------------- @@ -234,7 +234,7 @@ SELECT citus.mitmproxy('conn.onQuery(query="^TRUNCATE pg_dist_node CASCADE").can SELECT stop_metadata_sync_to_node('localhost', :worker_2_proxy_port); NOTICE: dropping metadata on the node (localhost,9060) ERROR: canceling statement due to user request -SELECT citus.mitmproxy('conn.onQuery(query="^TRUNCATE pg_dist_node CASCADE").kill()'); +SELECT citus.mitmproxy('conn.onQuery(query="^DELETE FROM pg_dist_node").kill()'); mitmproxy --------------------------------------------------------------------- diff --git a/src/test/regress/sql/failure_mx_metadata_sync.sql b/src/test/regress/sql/failure_mx_metadata_sync.sql index 96ee40e99..74b2f52f6 100644 --- a/src/test/regress/sql/failure_mx_metadata_sync.sql +++ b/src/test/regress/sql/failure_mx_metadata_sync.sql @@ -30,10 +30,10 @@ SELECT citus_activate_node('localhost', :worker_2_proxy_port); SELECT citus.mitmproxy('conn.onQuery(query="^DELETE FROM pg_dist_partition").kill()'); SELECT citus_activate_node('localhost', :worker_2_proxy_port); --- Failure to truncate pg_dist_node in the worker -SELECT citus.mitmproxy('conn.onQuery(query="^TRUNCATE pg_dist_node CASCADE").cancel(' || :pid || ')'); +-- Failure to delete pg_dist_node entries from the worker +SELECT citus.mitmproxy('conn.onQuery(query="^DELETE FROM pg_dist_node").cancel(' || :pid || ')'); SELECT start_metadata_sync_to_node('localhost', :worker_2_proxy_port); -SELECT citus.mitmproxy('conn.onQuery(query="^TRUNCATE pg_dist_node CASCADE").kill()'); +SELECT citus.mitmproxy('conn.onQuery(query="^DELETE FROM pg_dist_node").kill()'); SELECT start_metadata_sync_to_node('localhost', :worker_2_proxy_port); -- Failure to populate pg_dist_node in the worker @@ -70,10 +70,10 @@ SELECT stop_metadata_sync_to_node('localhost', :worker_2_proxy_port); SELECT citus.mitmproxy('conn.onQuery(query="^UPDATE pg_dist_local_group SET groupid").kill()'); SELECT stop_metadata_sync_to_node('localhost', :worker_2_proxy_port); --- Failure to truncate pg_dist_node in the worker -SELECT citus.mitmproxy('conn.onQuery(query="^TRUNCATE pg_dist_node CASCADE").cancel(' || :pid || ')'); +-- Failure to delete pg_dist_node entries from the worker +SELECT citus.mitmproxy('conn.onQuery(query="^DELETE FROM pg_dist_node").cancel(' || :pid || ')'); SELECT stop_metadata_sync_to_node('localhost', :worker_2_proxy_port); -SELECT citus.mitmproxy('conn.onQuery(query="^TRUNCATE pg_dist_node CASCADE").kill()'); +SELECT citus.mitmproxy('conn.onQuery(query="^DELETE FROM pg_dist_node").kill()'); SELECT stop_metadata_sync_to_node('localhost', :worker_2_proxy_port); \c - - - :worker_2_port