Merge branch 'master' of github.com:postgrespro/postgres_cluster

kelvich · kelvich · commit fe0ec43811b9 · 2016-12-05T14:41:55.000+03:00
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -779,7 +779,7 @@ static void MtmMonitor(Datum arg)
 		if (rc & WL_POSTMASTER_DEATH) { 
 			break;
 		}
-		MtmRefreshClusterStatus(true, 0);
+		MtmRefreshClusterStatus(true);
 	}
 }
 
@@ -1086,7 +1086,7 @@ static void MtmReceiver(Datum arg)
 			}
 			if (n == 0 && Mtm->disabledNodeMask != 0) { 
 				/* If timeout is expired and there are disabled nodes, then recheck cluster's state */
-				MtmRefreshClusterStatus(false, 0);
+				MtmRefreshClusterStatus(false);
 			}
 		}
 	}
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -1638,8 +1638,8 @@ bool MtmRecoveryCaughtUp(int nodeId, XLogRecPtr slotLSN)
 				BIT_CLEAR(Mtm->nodeLockerMask, nodeId-1);
 				Mtm->nLockers -= 1;
 			} else { 
-				MTM_LOG1("%d: node %d is caugth-up without locking cluster", MyProcPid, nodeId);	
-				/* We are lucky: caugth-up without locking cluster! */
+				MTM_LOG1("%d: node %d is caught-up without locking cluster", MyProcPid, nodeId);	
+				/* We are lucky: caught-up without locking cluster! */
 			}
 			MtmEnableNode(nodeId);
 			Mtm->nConfigChanges += 1;
@@ -1789,9 +1789,9 @@ MtmBuildConnectivityMatrix(nodemask_t* matrix, bool nowait)
  * Build connectivity graph, find clique in it and extend disabledNodeMask by nodes not included in clique.
  * This function returns false if current node is excluded from cluster, true otherwise
  */
-bool MtmRefreshClusterStatus(bool nowait, int testNodeId)
+bool MtmRefreshClusterStatus(bool nowait)
 {
-	nodemask_t mask, clique, disabled, enabled;
+	nodemask_t mask, clique, disabled;
 	nodemask_t matrix[MAX_NODES];
 	int clique_size;
 	int i;
@@ -1832,13 +1832,6 @@ bool MtmRefreshClusterStatus(bool nowait, int testNodeId)
 					}
 				}
 			}
-		}		
-		enabled = clique & Mtm->disabledNodeMask; /* new enabled nodes mask */		
-		if (testNodeId != 0 && BIT_CHECK(enabled, testNodeId-1)) { 
-			MtmEnableNode(testNodeId);
-		}
-
-		if (disabled|enabled) {
 			MtmCheckQuorum();
 		}			
 #if 0
@@ -1918,7 +1911,7 @@ void MtmOnNodeDisconnect(int nodeId)
 	}
 
 	MtmSleep(MSEC_TO_USEC(MtmHeartbeatSendTimeout));
-	MtmRefreshClusterStatus(false, 0);
+	MtmRefreshClusterStatus(false);
 }
 
 void MtmOnNodeConnect(int nodeId)
@@ -3087,12 +3080,7 @@ MtmReplicationStartupHook(struct PGLogicalStartupHookArgs* args)
 			MtmCheckQuorum();
 		} else {
 			MtmUnlock();
-			MtmRefreshClusterStatus(true, MtmReplicationNodeId);
-			MtmLock(LW_SHARED);
-			if (BIT_CHECK(Mtm->disabledNodeMask, MtmReplicationNodeId-1)) {
-				MtmUnlock();
-				elog(ERROR, "Disabled node %d tries to reconnect without recovery", MtmReplicationNodeId); 
-			}
+			elog(ERROR, "Disabled node %d tries to reconnect without recovery", MtmReplicationNodeId); 
 		}
 	} else {
 		MTM_LOG1("Node %d start logical replication to node %d in normal mode", MtmNodeId, MtmReplicationNodeId); 
diff --git a/contrib/mmts/multimaster.h b/contrib/mmts/multimaster.h
@@ -350,7 +350,7 @@ extern TransactionId MtmGetCurrentTransactionId(void);
 extern XidStatus MtmGetCurrentTransactionStatus(void);
 extern XidStatus MtmExchangeGlobalTransactionStatus(char const* gid, XidStatus status);
 extern bool  MtmIsRecoveredNode(int nodeId);
-extern bool  MtmRefreshClusterStatus(bool nowait, int testNodeId);
+extern bool  MtmRefreshClusterStatus(bool nowait);
 extern void  MtmSwitchClusterMode(MtmNodeStatus mode);
 extern void  MtmUpdateNodeConnectionInfo(MtmConnectionInfo* conn, char const* connStr);
 extern void  MtmSetupReplicationHooks(struct PGLogicalHooks* hooks);

Original file line number	Diff line number	Diff line change
`@@ -779,7 +779,7 @@ static void MtmMonitor(Datum arg)`
`779`	`779`	`if (rc & WL_POSTMASTER_DEATH) {`
`780`	`780`	`break;`
`781`	`781`	`}`
`782`		`- MtmRefreshClusterStatus(true, 0);`
	`782`	`+ MtmRefreshClusterStatus(true);`
`783`	`783`	`}`
`784`	`784`	`}`
`785`	`785`
`@@ -1086,7 +1086,7 @@ static void MtmReceiver(Datum arg)`
`1086`	`1086`	`}`
`1087`	`1087`	`if (n == 0 && Mtm->disabledNodeMask != 0) {`
`1088`	`1088`	`/* If timeout is expired and there are disabled nodes, then recheck cluster's state */`
`1089`		`- MtmRefreshClusterStatus(false, 0);`
	`1089`	`+ MtmRefreshClusterStatus(false);`
`1090`	`1090`	`}`
`1091`	`1091`	`}`
`1092`	`1092`	`}`