framework: Do not update mshost_peer when mgmt server is Up as it will be updated by status update

Author: weizhouapache

framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java

@@ -758,16 +758,7 @@ private void queueNotification(final ClusterManagerMessage msg) {
         }
 
         switch (msg.getMessageType()) {
-        case nodeAdded: {
-            final List<ManagementServerHostVO> l = msg.getNodes();
-            if (l != null && l.size() > 0) {
-                for (final ManagementServerHostVO mshost : l) {
-                    if (mshost.getId() != _mshostId) {
-                        _mshostPeerDao.updatePeerInfo(_mshostId, mshost.getId(), mshost.getRunid(), ManagementServerHost.State.Up);
-                    }
-                }
-            }
-        }
+        case nodeAdded:
         break;
 
         case nodeRemoved: {

server/src/main/java/com/cloud/server/StatsCollector.java

@@ -1159,15 +1159,7 @@ public String newStatus(ClusterServicePdu pdu) {
                 managementServerHostStats.put(hostStatsEntry.getManagementServerHostUuid(), hostStatsEntry);
 
                 // Update peer state to Up in mshost_peer
-                ManagementServerHostVO mgmtServerVo = managementServerHostDao.findByMsid(managementServerNodeId);
-                if (mgmtServerVo != null) {
-                    msId = mgmtServerVo.getId();
-                    if (msId != hostStatsEntry.getManagementServerHostId()) {
-                        managementServerHostPeerDao.updatePeerInfo(msId, hostStatsEntry.getManagementServerHostId(), hostStatsEntry.getManagementServerRunId(), ManagementServerHost.State.Up);
-                    }
-                } else {
-                    logger.warn(String.format("Cannot find management server with msid [%s]. Therefore, do not update peer info.", managementServerNodeId));
-                }
+                updatePeerInfo(hostStatsEntry);
             } catch (JsonParseException e) {
                 logger.error("Exception in decoding of other MS hosts status from : " + pdu.getSourcePeer());
                 if (logger.isDebugEnabled()) {
@@ -1177,6 +1169,23 @@ public String newStatus(ClusterServicePdu pdu) {
             return null;
         }
 
+        private void updatePeerInfo(ManagementServerHostStatsEntry hostStatsEntry) {
+            // Update msId to id of the management server if msId is same as managementServerNodeId
+            if (msId == managementServerNodeId) {
+                ManagementServerHostVO mgmtServerVo = managementServerHostDao.findByMsid(managementServerNodeId);
+                if (mgmtServerVo != null) {
+                    msId = mgmtServerVo.getId();
+                } else {
+                    logger.warn(String.format("Cannot find management server with msid [%s]. Therefore, do not update peer info.", managementServerNodeId));
+                    return;
+                }
+            }
+            // Update peer state to Up in mshost_peer
+            if (msId != hostStatsEntry.getManagementServerHostId()) {
+                managementServerHostPeerDao.updatePeerInfo(msId, hostStatsEntry.getManagementServerHostId(), hostStatsEntry.getManagementServerRunId(), ManagementServerHost.State.Up);
+            }
+        }
+
         @Override
         public void onManagementNodeJoined(List<? extends ManagementServerHost> nodeList, long selfNodeId) {
             // do nothing, but wait for the status to come through