Merge pull request #1274 from gravitl/bugfix_v0.14.5_HA

Bugfix v0.14.5 ha

logic/server.go

@@ -164,6 +164,11 @@ func ServerJoin(networkSettings *models.Network) (models.Node, error) {
 // ServerUpdate - updates the server
 // replaces legacy Checkin code
 func ServerUpdate(serverNode *models.Node, ifaceDelta bool) error {
+	if !IsLocalServer(serverNode) {
+		logger.Log(1, "skipping server update as not the leader")
+		return nil
+	}
+
 	var err = ServerPull(serverNode, ifaceDelta)
 	if isDeleteError(err) {
 		return DeleteNodeByID(serverNode, true)

mq/publishers.go

@@ -119,7 +119,7 @@ func sendPeers() {
 
 	for _, network := range networks {
 		serverNode, errN := logic.GetNetworkServerLeader(network.NetID)
-		if errN == nil {
+		if errN == nil && logic.IsLocalServer(&serverNode) {
 			serverNode.SetLastCheckIn()
 			logic.UpdateNode(&serverNode, &serverNode)
 			if network.DefaultUDPHolePunch == "yes" {
@@ -137,7 +137,9 @@ func sendPeers() {
 		} else {
 			logger.Log(1, "unable to retrieve leader for network ", network.NetID)
 			serverctl.SyncServerNetwork(network.NetID)
-			logger.Log(1, errN.Error())
+			if errN != nil {
+				logger.Log(1, errN.Error())
+			}
 			continue
 		}
 	}