From 2fec99d7b0fbe5cfa9402da2200c6e1263339910 Mon Sep 17 00:00:00 2001
From: Nitish Upreti <niupre@microsoft.com>
Date: Thu, 15 Sep 2022 17:27:23 -0700
Subject: [PATCH] Fixing failures

---
 .../replication/multi_logical_replication.c   | 22 ++++++++++++-------
 .../transaction/remote_transaction.c          |  3 ++-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/backend/distributed/replication/multi_logical_replication.c b/src/backend/distributed/replication/multi_logical_replication.c
index ef7e7264a..ab98d8216 100644
--- a/src/backend/distributed/replication/multi_logical_replication.c
+++ b/src/backend/distributed/replication/multi_logical_replication.c
@@ -1211,8 +1211,10 @@ CreateUncheckedForeignKeyConstraints(List *logicalRepTargetList)
 				list_make1("SET LOCAL citus.skip_constraint_validation TO ON;"),
 				commandList);
 
-			SendCommandListToWorkerOutsideTransactionWithConnection(
-				target->superuserConnection,
+			SendCommandListToWorkerOutsideTransaction(
+				target->superuserConnection->hostname,
+				target->superuserConnection->port,
+				target->superuserConnection->user,
 				commandList);
 
 			MemoryContextReset(localContext);
@@ -1591,8 +1593,8 @@ DropUser(MultiConnection *connection, char *username)
 	 * The DROP USER command should not propagate, so we temporarily disable
 	 * DDL propagation.
 	 */
-	SendCommandListToWorkerOutsideTransactionWithConnection(
-		connection,
+	SendCommandListToWorkerOutsideTransaction(
+		connection->hostname, connection->port, connection->user,
 		list_make2(
 			"SET LOCAL citus.enable_ddl_propagation TO OFF;",
 			psprintf("DROP USER IF EXISTS %s",
@@ -1777,8 +1779,10 @@ CreateSubscriptions(MultiConnection *sourceConnection,
 		 * create a user with SUPERUSER permissions and then alter it to NOSUPERUSER.
 		 * This prevents permission escalations.
 		 */
-		SendCommandListToWorkerOutsideTransactionWithConnection(
-			target->superuserConnection,
+		SendCommandListToWorkerOutsideTransaction(
+			target->superuserConnection->hostname,
+			target->superuserConnection->port,
+			target->superuserConnection->user,
 			list_make2(
 				"SET LOCAL citus.enable_ddl_propagation TO OFF;",
 				psprintf(
@@ -1836,8 +1840,10 @@ CreateSubscriptions(MultiConnection *sourceConnection,
 		 * The ALTER ROLE command should not propagate, so we temporarily
 		 * disable DDL propagation.
 		 */
-		SendCommandListToWorkerOutsideTransactionWithConnection(
-			target->superuserConnection,
+		SendCommandListToWorkerOutsideTransaction(
+			target->superuserConnection->hostname,
+			target->superuserConnection->port,
+			target->superuserConnection->user,
 			list_make2(
 				"SET LOCAL citus.enable_ddl_propagation TO OFF;",
 				psprintf(
diff --git a/src/backend/distributed/transaction/remote_transaction.c b/src/backend/distributed/transaction/remote_transaction.c
index 55a560575..30e53b6cf 100644
--- a/src/backend/distributed/transaction/remote_transaction.c
+++ b/src/backend/distributed/transaction/remote_transaction.c
@@ -803,7 +803,8 @@ CoordinatedRemoteTransactionsPrepare(void)
 													  iter.cur);
 		RemoteTransaction *transaction = &connection->remoteTransaction;
 
-		Assert(transaction->transactionState != REMOTE_TRANS_NOT_STARTED);
+		//  This is not true as we call ResetConnection() on InProgressTransactions
+		// Assert(transaction->transactionState != REMOTE_TRANS_NOT_STARTED);
 
 		/* can't PREPARE a transaction that failed */
 		if (transaction->transactionFailed)