From a0ab06b1862ee5a6cf88f0fdc00cd13f4c9b4eec Mon Sep 17 00:00:00 2001 From: keshav Date: Thu, 8 Sep 2011 16:39:34 -0700 Subject: [PATCH] Excluded external firewall/LB from host stats collection, and included them in ping checks --- server/src/com/cloud/agent/manager/AgentMonitor.java | 4 +--- server/src/com/cloud/server/StatsCollector.java | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/com/cloud/agent/manager/AgentMonitor.java b/server/src/com/cloud/agent/manager/AgentMonitor.java index 6e58cbdd195..b8499c3d1f0 100755 --- a/server/src/com/cloud/agent/manager/AgentMonitor.java +++ b/server/src/com/cloud/agent/manager/AgentMonitor.java @@ -235,9 +235,7 @@ public class AgentMonitor extends Thread implements Listener { @Override public void processConnect(HostVO host, StartupCommand cmd, boolean forRebalance) { - if (host.getType().equals(Host.Type.ExternalFirewall) || - host.getType().equals(Host.Type.ExternalLoadBalancer) || - host.getType().equals(Host.Type.TrafficMonitor) || + if (host.getType().equals(Host.Type.TrafficMonitor) || host.getType().equals(Host.Type.SecondaryStorage)) { return; } diff --git a/server/src/com/cloud/server/StatsCollector.java b/server/src/com/cloud/server/StatsCollector.java index df2c705e242..8a35cbbbe34 100755 --- a/server/src/com/cloud/server/StatsCollector.java +++ b/server/src/com/cloud/server/StatsCollector.java @@ -162,7 +162,9 @@ public class StatsCollector { sc.addAnd("type", SearchCriteria.Op.NEQ, Host.Type.SecondaryStorage.toString()); sc.addAnd("type", SearchCriteria.Op.NEQ, Host.Type.LocalSecondaryStorage.toString()); sc.addAnd("type", SearchCriteria.Op.NEQ, Host.Type.TrafficMonitor.toString()); - sc.addAnd("type", SearchCriteria.Op.NEQ, Host.Type.SecondaryStorageVM.toString()); + sc.addAnd("type", SearchCriteria.Op.NEQ, Host.Type.SecondaryStorageVM.toString()); + sc.addAnd("type", SearchCriteria.Op.NEQ, Host.Type.ExternalFirewall.toString()); + sc.addAnd("type", SearchCriteria.Op.NEQ, Host.Type.ExternalLoadBalancer.toString()); ConcurrentHashMap hostStats = new ConcurrentHashMap(); List hosts = _hostDao.search(sc, null); for (HostVO host : hosts)