Revert "PGPRO-1238 fix recovery of prepared tranasctions in minor node"

This reverts commit 98e6b043f2a8c93ffe6df2777dfa94837eb155a3.

Author: kelvich

multimaster.c

@@ -1707,27 +1707,8 @@ static void MtmBroadcastPollMessage(MtmTransState* ts)
 
 	if (nparts == 1)
 	{
-		int refereeWinnerId = MtmRefereeReadSaved();
-		if (MtmMajorNode || refereeWinnerId == MtmNodeId)
-		{
-			MTM_ELOG(LOG, "%s node commits prepared transaction %s", MtmMajorNode ? "Major" : "Winner", ts->gid);
-			/* we were in major mode and there nobody to ask about status */
-			MtmFinishPreparedTransaction(ts, true);
-		}
-		else
-		{
-			int coordinator = 0;
-			sscanf(ts->gid, "MTM-%d", &coordinator);
-			if (coordinator == MtmNodeId && ts->status == TRANSACTION_STATUS_IN_PROGRESS) {
-				/* it is always safe to rollback self transaction which was not precommitted: it can not be committed anywhere else */
-				MTM_ELOG(LOG, "Coordinator node rollback not precommitted transaction %s", ts->gid);
-				MtmFinishPreparedTransaction(ts, false);
-			}
-			else
-			{
-				MTM_ELOG(WARNING, "Doesn't know waht to do with transaction prepared transaction %s", ts->gid);
-			}
-		}
+		/* we were in major mode and there nobody to ask about status */
+		MtmFinishPreparedTransaction(ts, true);
 		return;
 	}
 

state.c

@@ -31,6 +31,7 @@ char const* const MtmEventMnem[] =
 
 static int  MtmRefereeGetWinner(void);
 static bool MtmRefereeClearWinner(void);
+static int  MtmRefereeReadSaved(void);
 
 static bool mtm_state_initialized;
 
@@ -585,7 +586,7 @@ MtmRefereeHasLocalTable()
 	return OidIsValid(rel_oid);
 }
 
-int
+static int
 MtmRefereeReadSaved(void)
 {
 	int winner = -1;

state.h

@@ -30,11 +30,9 @@ extern void MtmOnNodeDisconnect(int nodeId);
 extern void MtmOnNodeConnect(int nodeId);
 extern void MtmReconnectNode(int nodeId);
 
-extern int  MtmRefereeReadSaved(void);
-
 extern void MtmRefreshClusterStatus(void);
 
 extern int countZeroBits(nodemask_t mask, int nNodes);
 
 extern MtmNodeStatus MtmGetCurrentStatus(void);
-extern nodemask_t MtmGetDisabledNodeMask(void);
+extern nodemask_t MtmGetDisabledNodeMask(void);

tests/makefile

@@ -1,17 +1,13 @@
 CXX=g++
-CC=gcc
-CFLAGS=-g -Wall -O0 -pthread 
+CXXFLAGS=-g -Wall -O0 -pthread 
 
-all: dtmbench dtmacid insert
+all: dtmbench dtmacid
 
 dtmbench: dtmbench.cpp
-	$(CXX) $(CFLAGS) -o dtmbench dtmbench.cpp -lpqxx -lpq
+	$(CXX) $(CXXFLAGS) -o dtmbench dtmbench.cpp -lpqxx -lpq
 
 dtmacid: dtmacid.cpp
-	$(CXX) $(CFLAGS) -o dtmacid dtmacid.cpp -lpqxx -lpq
-
-insert: insert.c
-	$(CC) $(CFLAGS) -o insert insert.c -lpq
+	$(CXX) $(CXXFLAGS) -o dtmacid dtmacid.cpp -lpqxx -lpq
 
 clean:
 	rm -f dtmbench dtmacid