Print expected seqno

knizhnik · knizhnik · commit d952fd47109d · 2016-07-27T18:01:53.000+03:00
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -463,9 +463,10 @@ static int MtmConnectSocket(char const* host, int port, int timeout)
 		goto Retry;
 	}
 	
-	/* Some node considered that I am dead, so switch to recovery mode */
 	MtmLock(LW_EXCLUSIVE);
 	Mtm->nodes[resp.node-1].sendSeqNo = resp.seqno;
+
+	/* Some node considered that I am dead, so switch to recovery mode */
 	if (BIT_CHECK(resp.disabledNodeMask, MtmNodeId-1)) { 
 		elog(WARNING, "Node %d thinks that I was dead", resp.node);
 		BIT_SET(Mtm->disabledNodeMask, MtmNodeId-1);
@@ -861,7 +862,7 @@ static void MtmTransReceiver(Datum arg)
 						continue;
 					}
 					if (msg->seqno <= Mtm->nodes[msg->node-1].recvSeqNo) { 
-						elog(WARNING, "Ignore duplicated message %ld from node %d", msg->seqno, msg->node);
+						elog(WARNING, "Ignore duplicated message %ld (<=%ld) from node %d", msg->seqno, Mtm->nodes[msg->node-1].recvSeqNo, msg->node);
 						continue;
 					}
 					Mtm->nodes[msg->node-1].recvSeqNo = msg->seqno;

Original file line number	Diff line number	Diff line change
`@@ -463,9 +463,10 @@ static int MtmConnectSocket(char const* host, int port, int timeout)`
`463`	`463`	`goto Retry;`
`464`	`464`	`}`
`465`	`465`
`466`		`- /* Some node considered that I am dead, so switch to recovery mode */`
`467`	`466`	`MtmLock(LW_EXCLUSIVE);`
`468`	`467`	`Mtm->nodes[resp.node-1].sendSeqNo = resp.seqno;`
	`468`	`+`
	`469`	`+ /* Some node considered that I am dead, so switch to recovery mode */`
`469`	`470`	`if (BIT_CHECK(resp.disabledNodeMask, MtmNodeId-1)) {`
`470`	`471`	`elog(WARNING, "Node %d thinks that I was dead", resp.node);`
`471`	`472`	`BIT_SET(Mtm->disabledNodeMask, MtmNodeId-1);`
`@@ -861,7 +862,7 @@ static void MtmTransReceiver(Datum arg)`
`861`	`862`	`continue;`
`862`	`863`	`}`
`863`	`864`	`if (msg->seqno <= Mtm->nodes[msg->node-1].recvSeqNo) {`
`864`		`- elog(WARNING, "Ignore duplicated message %ld from node %d", msg->seqno, msg->node);`
	`865`	`+ elog(WARNING, "Ignore duplicated message %ld (<=%ld) from node %d", msg->seqno, Mtm->nodes[msg->node-1].recvSeqNo, msg->node);`
`865`	`866`	`continue;`
`866`	`867`	`}`
`867`	`868`	`Mtm->nodes[msg->node-1].recvSeqNo = msg->seqno;`