Restpore assert in arbiter on receiving PREPARE in aborted state

knizhnik · knizhnik · commit c7b969f75496 · 2016-06-28T16:00:45.000+03:00
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -915,15 +915,17 @@ static void MtmTransReceiver(Datum arg)
 					} else { 
 						switch (msg->code) { 
 						  case MSG_PREPARE:
-							if (ts->status == TRANSACTION_STATUS_IN_PROGRESS) { 
-								ts->status = TRANSACTION_STATUS_UNKNOWN;
-								ts->csn = MtmAssignCSN();
-								MtmAdjustSubtransactions(ts);
-								MtmSendNotificationMessage(ts, MSG_PREPARED);
+							Assert(ts->status == TRANSACTION_STATUS_IN_PROGRESS);
+							ts->status = TRANSACTION_STATUS_UNKNOWN;
+							ts->csn = MtmAssignCSN();
+							MtmAdjustSubtransactions(ts);
+							MtmSendNotificationMessage(ts, MSG_PREPARED);
+#if 0							
 							} else {
 								Assert(ts->status == TRANSACTION_STATUS_ABORTED);
 								MtmSendNotificationMessage(ts, MSG_ABORTED);
 							}
+#endif
 							break;
 						  default:
 							Assert(false);
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -798,7 +798,7 @@ void MtmWatchdog(void)
 			if (Mtm->nodes[i].lastHeartbeat != 0
 				&& now > Mtm->nodes[i].lastHeartbeat + MSEC_TO_USEC(MtmHeartbeatRecvTimeout)) 
 			{ 
-				elog(WARNING, "Heartbeat was received from node %d during %d msec", 
+				elog(WARNING, "Heartbeat is not received from node %d during %d msec", 
 					 i+1, (int)USEC_TO_MSEC(now - Mtm->nodes[i].lastHeartbeat));
 				MtmOnNodeDisconnect(i+1);				
 			}

Original file line number	Diff line number	Diff line change
`@@ -798,7 +798,7 @@ void MtmWatchdog(void)`
`798`	`798`	`if (Mtm->nodes[i].lastHeartbeat != 0`
`799`	`799`	`&& now > Mtm->nodes[i].lastHeartbeat + MSEC_TO_USEC(MtmHeartbeatRecvTimeout))`
`800`	`800`	`{`
`801`		`- elog(WARNING, "Heartbeat was received from node %d during %d msec",`
	`801`	`+ elog(WARNING, "Heartbeat is not received from node %d during %d msec",`
`802`	`802`	`i+1, (int)USEC_TO_MSEC(now - Mtm->nodes[i].lastHeartbeat));`
`803`	`803`	`MtmOnNodeDisconnect(i+1);`
`804`	`804`	`}`