From e3252e5e66b892336e0c039dfe1ed20cdc3c1de0 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 d44b872e5a2..a6bc60954f1 100755 --- a/server/src/com/cloud/agent/manager/AgentMonitor.java +++ b/server/src/com/cloud/agent/manager/AgentMonitor.java @@ -241,9 +241,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 ca3e8078cd1..9f429575d18 100755 --- a/server/src/com/cloud/server/StatsCollector.java +++ b/server/src/com/cloud/server/StatsCollector.java @@ -159,7 +159,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)