From ea15caf3698bcd412cbc7841a9b2df8679f65070 Mon Sep 17 00:00:00 2001 From: naisila Date: Thu, 28 Jul 2022 16:21:50 +0300 Subject: [PATCH] Change warning message in pg_signal_backend() Relevant PG commit: 7fa945b857cc1b2964799411f1633468826861ff --- src/test/regress/bin/normalize.sed | 3 +++ src/test/regress/expected/global_cancel.out | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/test/regress/bin/normalize.sed b/src/test/regress/bin/normalize.sed index 19bbdaaea..6716788ba 100644 --- a/src/test/regress/bin/normalize.sed +++ b/src/test/regress/bin/normalize.sed @@ -116,6 +116,9 @@ s/(ERROR: |WARNING: |error:) server closed the connection unexpectedly/\1 connec /^\s*connection not open$/d #endif /* (PG_VERSION_NUM >= PG_VERSION_13) && (PG_VERSION_NUM < PG_VERSION_14) */ +# pg15 changes +s/is not a PostgreSQL server process/is not a PostgreSQL backend process/g + # intermediate_results s/(ERROR.*)pgsql_job_cache\/([0-9]+_[0-9]+_[0-9]+)\/(.*).data/\1pgsql_job_cache\/xx_x_xxx\/\3.data/g diff --git a/src/test/regress/expected/global_cancel.out b/src/test/regress/expected/global_cancel.out index a028df420..7ca531820 100644 --- a/src/test/regress/expected/global_cancel.out +++ b/src/test/regress/expected/global_cancel.out @@ -64,7 +64,7 @@ ERROR: canceling statement due to user request SET client_min_messages TO DEBUG; -- 10000000000 is the node id multiplier for global pid SELECT pg_cancel_backend(10000000000 * citus_coordinator_nodeid() + 0); -DEBUG: PID 0 is not a PostgreSQL server process +DEBUG: PID 0 is not a PostgreSQL backend process DETAIL: from localhost:xxxxx pg_cancel_backend --------------------------------------------------------------------- @@ -72,7 +72,7 @@ DETAIL: from localhost:xxxxx (1 row) SELECT pg_terminate_backend(10000000000 * citus_coordinator_nodeid() + 0); -DEBUG: PID 0 is not a PostgreSQL server process +DEBUG: PID 0 is not a PostgreSQL backend process DETAIL: from localhost:xxxxx pg_terminate_backend ---------------------------------------------------------------------