From 10c0294785a8eccee0ff946e7adadafcf84df4ff Mon Sep 17 00:00:00 2001 From: Bharath Rupireddy Date: Tue, 4 May 2021 12:37:12 +0530 Subject: [PATCH v1] Stabilize a test case in postgres_fdw On clobber cached enabled platforms, one of the test case that got added by commit 93f4146 is not stable. This patch makes that test case stable by ignoring the pg_terminate_backend output. --- .../postgres_fdw/expected/postgres_fdw.out | 27 ++++++++----------- contrib/postgres_fdw/sql/postgres_fdw.sql | 19 ++++++++----- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/contrib/postgres_fdw/expected/postgres_fdw.out b/contrib/postgres_fdw/expected/postgres_fdw.out index 8e1cc69508..25c0ab7faa 100644 --- a/contrib/postgres_fdw/expected/postgres_fdw.out +++ b/contrib/postgres_fdw/expected/postgres_fdw.out @@ -9201,6 +9201,13 @@ WARNING: there is no transaction in progress -- =================================================================== -- reestablish new connection -- =================================================================== +-- Terminate the remote connection and wait for the termination to complete. +CREATE OR REPLACE PROCEDURE terminate_backend_and_wait(appname text) AS $$ +BEGIN + PERFORM pg_terminate_backend(pid, 180000) FROM pg_stat_activity + WHERE application_name = appname; +END; +$$ LANGUAGE plpgsql; -- Change application_name of remote connection to special one -- so that we can easily terminate the connection later. ALTER SERVER loopback OPTIONS (application_name 'fdw_retry_check'); @@ -9210,14 +9217,7 @@ SELECT 1 FROM ft1 LIMIT 1; 1 (1 row) --- Terminate the remote connection and wait for the termination to complete. -SELECT pg_terminate_backend(pid, 180000) FROM pg_stat_activity - WHERE application_name = 'fdw_retry_check'; - pg_terminate_backend ----------------------- - t -(1 row) - +CALL terminate_backend_and_wait('fdw_retry_check'); -- This query should detect the broken connection when starting new remote -- transaction, reestablish new connection, and then succeed. BEGIN; @@ -9230,20 +9230,15 @@ SELECT 1 FROM ft1 LIMIT 1; -- If the query detects the broken connection when starting new remote -- subtransaction, it doesn't reestablish new connection and should fail. -- The text of the error might vary across platforms, so don't show it. --- Terminate the remote connection and wait for the termination to complete. -SELECT pg_terminate_backend(pid, 180000) FROM pg_stat_activity - WHERE application_name = 'fdw_retry_check'; - pg_terminate_backend ----------------------- - t -(1 row) - +CALL terminate_backend_and_wait('fdw_retry_check'); SAVEPOINT s; \set VERBOSITY sqlstate SELECT 1 FROM ft1 LIMIT 1; -- should fail ERROR: 08006 \set VERBOSITY default COMMIT; +-- Clean up +DROP PROCEDURE terminate_backend_and_wait(text); -- ============================================================================= -- test connection invalidation cases and postgres_fdw_get_connections function -- ============================================================================= diff --git a/contrib/postgres_fdw/sql/postgres_fdw.sql b/contrib/postgres_fdw/sql/postgres_fdw.sql index dcd36a9753..b52165a9ac 100644 --- a/contrib/postgres_fdw/sql/postgres_fdw.sql +++ b/contrib/postgres_fdw/sql/postgres_fdw.sql @@ -2792,14 +2792,20 @@ ROLLBACK; -- reestablish new connection -- =================================================================== +-- Terminate the remote connection and wait for the termination to complete. +CREATE OR REPLACE PROCEDURE terminate_backend_and_wait(appname text) AS $$ +BEGIN + PERFORM pg_terminate_backend(pid, 180000) FROM pg_stat_activity + WHERE application_name = appname; +END; +$$ LANGUAGE plpgsql; + -- Change application_name of remote connection to special one -- so that we can easily terminate the connection later. ALTER SERVER loopback OPTIONS (application_name 'fdw_retry_check'); SELECT 1 FROM ft1 LIMIT 1; --- Terminate the remote connection and wait for the termination to complete. -SELECT pg_terminate_backend(pid, 180000) FROM pg_stat_activity - WHERE application_name = 'fdw_retry_check'; +CALL terminate_backend_and_wait('fdw_retry_check'); -- This query should detect the broken connection when starting new remote -- transaction, reestablish new connection, and then succeed. @@ -2809,15 +2815,16 @@ SELECT 1 FROM ft1 LIMIT 1; -- If the query detects the broken connection when starting new remote -- subtransaction, it doesn't reestablish new connection and should fail. -- The text of the error might vary across platforms, so don't show it. --- Terminate the remote connection and wait for the termination to complete. -SELECT pg_terminate_backend(pid, 180000) FROM pg_stat_activity - WHERE application_name = 'fdw_retry_check'; +CALL terminate_backend_and_wait('fdw_retry_check'); SAVEPOINT s; \set VERBOSITY sqlstate SELECT 1 FROM ft1 LIMIT 1; -- should fail \set VERBOSITY default COMMIT; +-- Clean up +DROP PROCEDURE terminate_backend_and_wait(text); + -- ============================================================================= -- test connection invalidation cases and postgres_fdw_get_connections function -- ============================================================================= -- 2.25.1