Fix wrong condition in DisableNode

knizhnik · kelvich · commit 337d429d39a8 · 2017-11-13T02:17:31.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -1601,8 +1601,9 @@ bool MtmRefreshClusterStatus(bool nowait, int testNodeId)
 			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 (Mtm->nodes[i].lastStatusChangeTime + MSEC_TO_USEC(MtmNodeDisableDelay) < now) {
 						MtmDisableNode(i+1);
+					}
 				}
 			}
 		}		
@@ -2580,7 +2581,7 @@ MtmReplicationMode MtmGetReplicationMode(int nodeId, sig_atomic_t volatile* shut
 		MtmSleep(STATUS_POLL_DELAY);
 	}
 	if (recovery) { 
-		MTM_LOG1("%d: Restart replication frim node %d after end of recovery", MyProcPid, nodeId);
+		MTM_LOG1("%d: Restart replication from node %d after end of recovery", MyProcPid, nodeId);
 	} else { 
 		MTM_LOG1("%d: Continue replication from node %d", MyProcPid, nodeId);
 	}

Original file line number	Diff line number	Diff line change
`@@ -1601,8 +1601,9 @@ bool MtmRefreshClusterStatus(bool nowait, int testNodeId)`
`1601`	`1601`	`timestamp_t now = MtmGetSystemTime();`
`1602`	`1602`	`for (i = 0, mask = disabled; mask != 0; i++, mask >>= 1) {`
`1603`	`1603`	`if (mask & 1) {`
`1604`		`- if (Mtm->nodes[i].lastStatusChangeTime + MSEC_TO_USEC(MtmNodeDisableDelay) > now)`
	`1604`	`+ if (Mtm->nodes[i].lastStatusChangeTime + MSEC_TO_USEC(MtmNodeDisableDelay) < now) {`
`1605`	`1605`	`MtmDisableNode(i+1);`
	`1606`	`+ }`
`1606`	`1607`	`}`
`1607`	`1608`	`}`
`1608`	`1609`	`}`
`@@ -2580,7 +2581,7 @@ MtmReplicationMode MtmGetReplicationMode(int nodeId, sig_atomic_t volatile* shut`
`2580`	`2581`	`MtmSleep(STATUS_POLL_DELAY);`
`2581`	`2582`	`}`
`2582`	`2583`	`if (recovery) {`
`2583`		`- MTM_LOG1("%d: Restart replication frim node %d after end of recovery", MyProcPid, nodeId);`
	`2584`	`+ MTM_LOG1("%d: Restart replication from node %d after end of recovery", MyProcPid, nodeId);`
`2584`	`2585`	`} else {`
`2585`	`2586`	`MTM_LOG1("%d: Continue replication from node %d", MyProcPid, nodeId);`
`2586`	`2587`	`}`