From 96c32d571ca2eaa19f3111f855972cce26c5de74 Mon Sep 17 00:00:00 2001
From: Nitish Upreti <niupre@microsoft.com>
Date: Wed, 14 Sep 2022 15:48:31 -0700
Subject: [PATCH] Fix connection bug

---
 src/backend/distributed/operations/shard_cleaner.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/backend/distributed/operations/shard_cleaner.c b/src/backend/distributed/operations/shard_cleaner.c
index 6e6f6f8bb..25e0b0384 100644
--- a/src/backend/distributed/operations/shard_cleaner.c
+++ b/src/backend/distributed/operations/shard_cleaner.c
@@ -756,10 +756,15 @@ TryDropShardOutsideTransaction(OperationId operationId, char *qualifiedTableName
 									   dropQuery->data);
 
 	/* remove the shard from the node */
-	MultiConnection *connection = GetLocalConnectionForSubtransactionAsUser(
-		CitusExtensionOwnerName());
+	int connectionFlags = OUTSIDE_TRANSACTION;
+	MultiConnection *workerConnection = GetNodeUserDatabaseConnection(connectionFlags,
+																	  nodeName, nodePort,
+																	  CurrentUserName(),
+																	  NULL);
+	workerConnection->forceCloseAtTransactionEnd = true;
+
 	bool success = SendOptionalCommandListToWorkerOutsideTransactionWithConnection(
-		connection,
+		workerConnection,
 		dropCommandList);
 
 	return success;