From d083a6cb71cbf9847cb4a995c3ad446c9029e3bf Mon Sep 17 00:00:00 2001
From: Marco Slot <marco.slot@gmail.com>
Date: Fri, 19 Aug 2022 10:57:07 +0200
Subject: [PATCH] Make sure we do subtransactions as superuser

---
 src/backend/distributed/operations/shard_cleaner.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/backend/distributed/operations/shard_cleaner.c b/src/backend/distributed/operations/shard_cleaner.c
index 8b852695a..a38e3b801 100644
--- a/src/backend/distributed/operations/shard_cleaner.c
+++ b/src/backend/distributed/operations/shard_cleaner.c
@@ -453,7 +453,17 @@ InsertCleanupRecordInSubtransaction(CleanupObjectType objectType, char *objectNa
 					 quote_literal_cstr(objectName),
 					 nodeGroupId);
 
-	ExecuteRebalancerCommandInSeparateTransaction(command->data);
+	int connectionFlag = FORCE_NEW_CONNECTION;
+	char *userName= CitusExtensionOwnerName();
+	MultiConnection *connection = GetNodeUserDatabaseConnection(connectionFlag,
+																LocalHostName,
+																PostPortNumber,
+																userName,
+																NULL);
+
+	ExecuteCriticalRemoteCommand(connection, command->data);
+	CloseConnection(connection);
+
 }