also fix possible overflow in MtmMinRecoveryLag

kelvich · kelvich · commit 7c0cf2eae38b · 2017-10-30T17:37:45.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -2104,7 +2104,7 @@ void MtmCheckRecoveryCaughtUp(int nodeId, lsn_t slotLSN)
 	if (MtmIsRecoveredNode(nodeId)) {
 		lsn_t walLSN = GetXLogInsertRecPtr();
 		if (!BIT_CHECK(Mtm->originLockNodeMask, nodeId-1)
-			&& slotLSN + MtmMinRecoveryLag * 1024 > walLSN)
+			&& slotLSN + (long64) MtmMinRecoveryLag * 1024 > walLSN)
 		{
 			/*
 			 * Wal sender almost caught up.

Original file line number	Diff line number	Diff line change
`@@ -2104,7 +2104,7 @@ void MtmCheckRecoveryCaughtUp(int nodeId, lsn_t slotLSN)`
`2104`	`2104`	`if (MtmIsRecoveredNode(nodeId)) {`
`2105`	`2105`	`lsn_t walLSN = GetXLogInsertRecPtr();`
`2106`	`2106`	`if (!BIT_CHECK(Mtm->originLockNodeMask, nodeId-1)`
`2107`		`- && slotLSN + MtmMinRecoveryLag * 1024 > walLSN)`
	`2107`	`+ && slotLSN + (long64) MtmMinRecoveryLag * 1024 > walLSN)`
`2108`	`2108`	`{`
`2109`	`2109`	`/*`
`2110`	`2110`	`* Wal sender almost caught up.`