From bd91df298fd4507efb6a96bacaa2450e87bc398d Mon Sep 17 00:00:00 2001
From: Naisila Puka <37271756+naisila@users.noreply.github.com>
Date: Tue, 31 Aug 2021 18:58:46 +0300
Subject: [PATCH] Fixes ConnectionModifiedPlacement output for a failed
 transaction (#5198)

---
 src/backend/distributed/transaction/remote_transaction.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/backend/distributed/transaction/remote_transaction.c b/src/backend/distributed/transaction/remote_transaction.c
index 8b67a2186..969f0d583 100644
--- a/src/backend/distributed/transaction/remote_transaction.c
+++ b/src/backend/distributed/transaction/remote_transaction.c
@@ -808,9 +808,11 @@ CoordinatedRemoteTransactionsPrepare(void)
 		if (transaction->transactionState != REMOTE_TRANS_PREPARING)
 		{
 			/*
-			 * Verify that the connection didn't modify any placement
+			 * Verify that either the transaction failed, hence we couldn't prepare
+			 * or the connection didn't modify any placement
 			 */
-			Assert(!ConnectionModifiedPlacement(connection));
+			Assert(transaction->transactionFailed ||
+				   !ConnectionModifiedPlacement(connection));
 			continue;
 		}