Merge branch 'PGPROEE9_6' of git.postgrespro.ru:pgpro-dev/postgrespro into PGPROEE9_6

Liudmila Mantrova · Liudmila Mantrova · commit 7c0e6d55b6e0 · 2017-03-24T17:28:23.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -2271,7 +2271,9 @@ void MtmRefreshClusterStatus()
 			timestamp_t now = MtmGetSystemTime();
 			for (i = 0, mask = disabled; mask != 0; i++, mask >>= 1) {
 				if (mask & 1) { 
-					if (Mtm->nodes[i].lastStatusChangeTime + MSEC_TO_USEC(MtmNodeDisableDelay) < now) {
+					if ((i+1 != MtmNodeId || Mtm->status == MTM_ONLINE)
+						&& Mtm->nodes[i].lastStatusChangeTime + MSEC_TO_USEC(MtmNodeDisableDelay) < now) 
+					{
 						MtmDisableNode(i+1);
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -2271,7 +2271,9 @@ void MtmRefreshClusterStatus()`
`2271`	`2271`	`timestamp_t now = MtmGetSystemTime();`
`2272`	`2272`	`for (i = 0, mask = disabled; mask != 0; i++, mask >>= 1) {`
`2273`	`2273`	`if (mask & 1) {`
`2274`		`- if (Mtm->nodes[i].lastStatusChangeTime + MSEC_TO_USEC(MtmNodeDisableDelay) < now) {`
	`2274`	`+ if ((i+1 != MtmNodeId \|\| Mtm->status == MTM_ONLINE)`
	`2275`	`+ && Mtm->nodes[i].lastStatusChangeTime + MSEC_TO_USEC(MtmNodeDisableDelay) < now)`
	`2276`	`+ {`
`2275`	`2277`	`MtmDisableNode(i+1);`
`2276`	`2278`	`}`
`2277`	`2279`	`}`