From 45b1d04850186c80877fc1785a2274e91dd88ec3 Mon Sep 17 00:00:00 2001 From: Onder Kalaci Date: Wed, 16 Feb 2022 17:07:33 +0100 Subject: [PATCH] Fix isolation tester --- .../distributed/connection/connection_configuration.c | 11 +++++++++-- .../distributed/test/run_from_same_connection.c | 3 ++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/backend/distributed/connection/connection_configuration.c b/src/backend/distributed/connection/connection_configuration.c index 41017fab9..cd12545c3 100644 --- a/src/backend/distributed/connection/connection_configuration.c +++ b/src/backend/distributed/connection/connection_configuration.c @@ -234,8 +234,15 @@ GetConnParams(ConnectionHashKey *key, char ***keywords, char ***values, char nodePortString[12] = ""; StringInfo applicationName = makeStringInfo(); - appendStringInfo(applicationName, "%s%ld", CITUS_APPLICATION_NAME_PREFIX, - GetGlobalPID()); + if (AllowNonIdleTransactionOnXactHandling()) + { + appendStringInfoString(applicationName, "citus isolation test"); + } + else + { + appendStringInfo(applicationName, "%s%ld", CITUS_APPLICATION_NAME_PREFIX, + GetGlobalPID()); + } /* * This function has three sections: diff --git a/src/backend/distributed/test/run_from_same_connection.c b/src/backend/distributed/test/run_from_same_connection.c index 3b5f804b4..5609c8869 100644 --- a/src/backend/distributed/test/run_from_same_connection.c +++ b/src/backend/distributed/test/run_from_same_connection.c @@ -104,8 +104,9 @@ start_session_level_connection_to_node(PG_FUNCTION_ARGS) */ if (singleConnection == NULL) { - singleConnection = GetNodeConnection(connectionFlags, nodeNameString, nodePort); allowNonIdleRemoteTransactionOnXactHandling = true; + + singleConnection = GetNodeConnection(connectionFlags, nodeNameString, nodePort); } if (PQstatus(singleConnection->pgConn) != CONNECTION_OK)