also fix possible overflow in MtmMinRecoveryLag

kelvich · kelvich · commit 976250e27831 · 2017-11-13T02:23:42.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -2100,7 +2100,7 @@ void MtmCheckRecoveryCaughtUp(int nodeId, lsn_t slotLSN)
 	if (MtmIsRecoveredNode(nodeId)) {
 		lsn_t walLSN = GetXLogInsertRecPtr();
 		if (!BIT_CHECK(Mtm->origenLockNodeMask, 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
`@@ -2100,7 +2100,7 @@ void MtmCheckRecoveryCaughtUp(int nodeId, lsn_t slotLSN)`
`2100`	`2100`	`if (MtmIsRecoveredNode(nodeId)) {`
`2101`	`2101`	`lsn_t walLSN = GetXLogInsertRecPtr();`
`2102`	`2102`	`if (!BIT_CHECK(Mtm->origenLockNodeMask, nodeId-1)`
`2103`		`- && slotLSN + MtmMinRecoveryLag * 1024 > walLSN)`
	`2103`	`+ && slotLSN + (long64) MtmMinRecoveryLag * 1024 > walLSN)`
`2104`	`2104`	`{`
`2105`	`2105`	`/*`
`2106`	`2106`	`* Wal sender almost caught up.`