change some debug messages

kelvich · kelvich · commit e8bdcc60a0e5 · 2016-12-05T14:30:09.000+03:00
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -361,7 +361,7 @@ static void MtmSendHeartbeat()
 				if (!MtmSendToNode(i, &msg, sizeof(msg))) { 
 					elog(LOG, "Arbiter failed to send heartbeat to node %d", i+1);
 				} else {
-					MTM_LOG2("Send heartbeat to node %d with timestamp %ld", i+1, now);    
+					MTM_LOG4("Send heartbeat to node %d with timestamp %ld", i+1, now);    
 				}
 			} else { 
 				MTM_LOG2("Do not send heartbeat to node %d, busy mask %lld, status %d", i+1, (long long) busy_mask, Mtm->status);
@@ -887,7 +887,7 @@ static void MtmReceiver(Datum arg)
 
 					switch (msg->code) {
 					  case MSG_HEARTBEAT:
-						MTM_LOG2("Receive HEARTBEAT from node %d with timestamp %ld delay %ld", 
+						MTM_LOG4("Receive HEARTBEAT from node %d with timestamp %ld delay %ld", 
 								 node, msg->csn, USEC_TO_MSEC(MtmGetSystemTime() - msg->csn)); 
 						continue;
 					  case MSG_POLL_REQUEST:
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -1028,6 +1028,7 @@ MtmPostPrepareTransaction(MtmCurrentTrans* x)
 	MTM_TXTRACE(x, "PostPrepareTransaction Start");
 
 	if (!x->isDistributed) {
+		MTM_TXTRACE(x, "not distributed?");
 		return;
 	}
 
@@ -1040,25 +1041,34 @@ MtmPostPrepareTransaction(MtmCurrentTrans* x)
 	Assert(ts != NULL);
 	//if (x->gid[0]) MTM_LOG1("Preparing transaction %d (%s) at %ld", x->xid, x->gid, MtmGetCurrentTime());
 	if (!MtmIsCoordinator(ts) || Mtm->status == MTM_RECOVERY) {
+		MTM_TXTRACE(x, "recovery?");
 		Assert(x->gid[0]);
 		ts->votingCompleted = true;
-		if (Mtm->status != MTM_RECOVERY || Mtm->recoverySlot != MtmReplicationNodeId) { 
+		MTM_TXTRACE(x, "recovery? 1");
+		if (Mtm->status != MTM_RECOVERY || Mtm->recoverySlot != MtmReplicationNodeId) {
+			MTM_TXTRACE(x, "recovery? 2"); 
 			MtmSend2PCMessage(ts, MSG_PREPARED); /* send notification to coordinator */
 			if (!MtmUseDtm) { 
 				ts->status = TRANSACTION_STATUS_UNKNOWN;
 			}
 		} else {
+			MTM_TXTRACE(x, "recovery? 3");
 			ts->status = TRANSACTION_STATUS_UNKNOWN;
 		}
+		MTM_TXTRACE(x, "recovery? 4");
 		MtmUnlock();
+		MTM_TXTRACE(x, "recovery? 5");
 		MtmResetTransaction();
+		MTM_TXTRACE(x, "recovery? 6");
 	} else { 
+		MTM_TXTRACE(x, "not recovery?");
 		Mtm2PCVoting(x, ts);
 		MtmUnlock();
 		if (x->isTwoPhase) { 
 			MtmResetTransaction();
 		}
 	}
+	MTM_TXTRACE(x, "recovery? 7");
 	//if (x->gid[0]) MTM_LOG1("Prepared transaction %d (%s) csn=%ld at %ld: %d", x->xid, x->gid, ts->csn, MtmGetCurrentTime(), ts->status);
 	if (Mtm->inject2PCError == 3) { 
 		Mtm->inject2PCError = 0;
