From 9c7b60f27d79c6b70bd73a622dfe5349c94d0083 Mon Sep 17 00:00:00 2001 From: Anthony Xu Date: Mon, 24 Mar 2014 16:06:26 -0700 Subject: [PATCH] addHostCmd will try to load all hosts in a pool --- .../cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java | 5 ----- server/src/com/cloud/resource/ResourceManagerImpl.java | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java index 0ad6dc4a02e..bd0f55c60de 100755 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java @@ -179,11 +179,6 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L } try { - List eHosts = _resourceMgr.listAllHostsInCluster(clusterId); - if (eHosts.size() > 0) { - HostVO eHost = eHosts.get(0); - _hostDao.loadDetails(eHost); - } String hostname = url.getHost(); InetAddress ia = InetAddress.getByName(hostname); String hostIp = ia.getHostAddress(); diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index f9a59ba4eb8..5a5c196f4ca 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -583,7 +583,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, } } - return discoverHostsFull(dcId, podId, clusterId, clusterName, url, username, password, cmd.getHypervisor(), hostTags, cmd.getFullUrlParams(), true); + return discoverHostsFull(dcId, podId, clusterId, clusterName, url, username, password, cmd.getHypervisor(), hostTags, cmd.getFullUrlParams(), false); } @Override