From 0feb1f2eb1e51304f11dcf2253982621a1bc68fe Mon Sep 17 00:00:00 2001
From: Marco Slot <marco.slot@gmail.com>
Date: Fri, 8 Jun 2018 21:24:39 +0200
Subject: [PATCH] Do not call CheckRemoteTransactionsHealth from commit handler

---
 .../distributed/transaction/remote_transaction.c    | 13 +++----------
 .../transaction/transaction_management.c            |  8 ++++++++
 src/include/distributed/remote_transaction.h        |  1 +
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/backend/distributed/transaction/remote_transaction.c b/src/backend/distributed/transaction/remote_transaction.c
index 81d874044..f8eaf3d74 100644
--- a/src/backend/distributed/transaction/remote_transaction.c
+++ b/src/backend/distributed/transaction/remote_transaction.c
@@ -43,7 +43,6 @@ static void StartRemoteTransactionSavepointRollback(MultiConnection *connection,
 static void FinishRemoteTransactionSavepointRollback(MultiConnection *connection,
 													 SubTransactionId subId);
 
-static void CheckTransactionHealth(void);
 static void Assign2PCIdentifier(MultiConnection *connection);
 static void WarnAboutLeakedPreparedTransaction(MultiConnection *connection, bool commit);
 
@@ -837,12 +836,6 @@ CoordinatedRemoteTransactionsCommit(void)
 	List *connectionList = NIL;
 	bool raiseInterrupts = false;
 
-	/*
-	 * Before starting to commit on any of the nodes - after which we can't
-	 * completely roll-back anymore - check that things are in a good state.
-	 */
-	CheckTransactionHealth();
-
 	/*
 	 * Issue appropriate transaction commands to remote nodes. If everything
 	 * went well that's going to be COMMIT or COMMIT PREPARED, if individual
@@ -1229,13 +1222,13 @@ FinishRemoteTransactionSavepointRollback(MultiConnection *connection, SubTransac
 
 
 /*
- * CheckTransactionHealth checks if any of the participating transactions in a
+ * CheckRemoteTransactionsHealth checks if any of the participating transactions in a
  * coordinated transaction failed, and what consequence that should have.
  * This needs to be called before the coordinated transaction commits (but
  * after they've been PREPAREd if 2PC is in use).
  */
-static void
-CheckTransactionHealth(void)
+void
+CheckRemoteTransactionsHealth(void)
 {
 	dlist_iter iter;
 
diff --git a/src/backend/distributed/transaction/transaction_management.c b/src/backend/distributed/transaction/transaction_management.c
index f4b7234ee..df269cf39 100644
--- a/src/backend/distributed/transaction/transaction_management.c
+++ b/src/backend/distributed/transaction/transaction_management.c
@@ -315,9 +315,17 @@ CoordinatedTransactionCallback(XactEvent event, void *arg)
 			{
 				CoordinatedRemoteTransactionsPrepare();
 				CurrentCoordinatedTransactionState = COORD_TRANS_PREPARED;
+
+				/*
+				 * Make sure we did not have any failures on connections marked as
+				 * critical before committing.
+				 */
+				CheckRemoteTransactionsHealth();
 			}
 			else
 			{
+				CheckRemoteTransactionsHealth();
+
 				/*
 				 * Have to commit remote transactions in PRE_COMMIT, to allow
 				 * us to mark failed placements as invalid.  Better don't use
diff --git a/src/include/distributed/remote_transaction.h b/src/include/distributed/remote_transaction.h
index b224fe483..92a065e11 100644
--- a/src/include/distributed/remote_transaction.h
+++ b/src/include/distributed/remote_transaction.h
@@ -130,6 +130,7 @@ extern void ResetRemoteTransaction(struct MultiConnection *connection);
 extern void CoordinatedRemoteTransactionsPrepare(void);
 extern void CoordinatedRemoteTransactionsCommit(void);
 extern void CoordinatedRemoteTransactionsAbort(void);
+extern void CheckRemoteTransactionsHealth(void);
 
 /* remote savepoint commands */
 extern void CoordinatedRemoteTransactionsSavepointBegin(SubTransactionId subId);