You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2013/09/02 22:05:32 UTC
[46/50] [abbrv] git commit: updated refs/heads/disk-cache to 99d67cb
CLOUDSTACK-4040: [Object_store_refactor] System VMs are not spinning up
if S3 storage configuration is not part of zone creation wizard.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8ff2061d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8ff2061d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8ff2061d
Branch: refs/heads/disk-cache
Commit: 8ff2061db7995abddac6865034d54abf36a8c93f
Parents: 151a7ee
Author: Min Chen <mi...@citrix.com>
Authored: Fri Aug 2 17:59:24 2013 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Fri Aug 2 18:17:58 2013 -0700
----------------------------------------------------------------------
server/src/com/cloud/resource/ResourceManagerImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8ff2061d/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 6115026..beb5f4e 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -2411,7 +2411,9 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
sc.addAnd(sc.getEntity().getDataCenterId(), Op.EQ, zoneId);
}
if (hostId != null) {
- sc.addAnd(sc.getEntity().getId(), Op.EQ, hostId);
+ // exclude the given host, since we want to check what hypervisor is already handled
+ // in adding this new host
+ sc.addAnd(sc.getEntity().getId(), Op.NEQ, hostId);
}
sc.addAnd(sc.getEntity().getType(), Op.EQ, Host.Type.Routing);
List<HostVO> hosts = sc.list();