Repository: cloudstack Updated Branches: refs/heads/4.4 7b19b6cc1 -> 9c7b60f27
addHostCmd will try to load all hosts in a pool Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9c7b60f2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9c7b60f2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9c7b60f2 Branch: refs/heads/4.4 Commit: 9c7b60f27d79c6b70bd73a622dfe5349c94d0083 Parents: 7b19b6c Author: Anthony Xu <[email protected]> Authored: Mon Mar 24 16:06:26 2014 -0700 Committer: Anthony Xu <[email protected]> Committed: Mon Mar 24 16:07:39 2014 -0700 ---------------------------------------------------------------------- .../cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java | 5 ----- server/src/com/cloud/resource/ResourceManagerImpl.java | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c7b60f2/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java ---------------------------------------------------------------------- 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 0ad6dc4..bd0f55c 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<HostVO> 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(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9c7b60f2/server/src/com/cloud/resource/ResourceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index f9a59ba..5a5c196 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
