cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From devd...@apache.org
Subject git commit: updated refs/heads/master to 34894f5
Date Mon, 23 Dec 2013 11:36:09 GMT
Updated Branches:
  refs/heads/master 216554d57 -> 34894f5a9


CLOUDSTACK-5564: The deployment on other hosts in the cluster used to fail because
cloudstack though the storage pool wasn't accessible from the host. Make sure host
to pool mapping is added in the storage_pool_host_ref table when a host is added
to the cluster.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/34894f5a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/34894f5a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/34894f5a

Branch: refs/heads/master
Commit: 34894f5a9dee00749c01376cb1576974e32f27ae
Parents: 216554d
Author: Devdeep Singh <devdeep@gmail.com>
Authored: Mon Dec 23 16:56:26 2013 +0530
Committer: Devdeep Singh <devdeep@gmail.com>
Committed: Mon Dec 23 17:06:11 2013 +0530

----------------------------------------------------------------------
 server/src/com/cloud/storage/listener/StoragePoolMonitor.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/34894f5a/server/src/com/cloud/storage/listener/StoragePoolMonitor.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/listener/StoragePoolMonitor.java b/server/src/com/cloud/storage/listener/StoragePoolMonitor.java
index 0c5d8f0..9f6b5fb 100755
--- a/server/src/com/cloud/storage/listener/StoragePoolMonitor.java
+++ b/server/src/com/cloud/storage/listener/StoragePoolMonitor.java
@@ -74,9 +74,9 @@ public class StoragePoolMonitor implements Listener {
     public void processConnect(Host host, StartupCommand cmd, boolean forRebalance) throws
ConnectionException {
         if (cmd instanceof StartupRoutingCommand) {
             StartupRoutingCommand scCmd = (StartupRoutingCommand)cmd;
-            if (scCmd.getHypervisorType() == HypervisorType.XenServer || scCmd.getHypervisorType()
== HypervisorType.KVM ||
-                scCmd.getHypervisorType() == HypervisorType.VMware || scCmd.getHypervisorType()
== HypervisorType.Simulator ||
-                scCmd.getHypervisorType() == HypervisorType.Ovm) {
+            if (scCmd.getHypervisorType() == HypervisorType.XenServer || scCmd.getHypervisorType()
==  HypervisorType.KVM ||
+                scCmd.getHypervisorType() == HypervisorType.VMware || scCmd.getHypervisorType()
==  HypervisorType.Simulator ||
+                scCmd.getHypervisorType() == HypervisorType.Ovm || scCmd.getHypervisorType()
== HypervisorType.Hyperv) {
                 List<StoragePoolVO> pools = _poolDao.listBy(host.getDataCenterId(),
host.getPodId(), host.getClusterId(), ScopeType.CLUSTER);
                 List<StoragePoolVO> zoneStoragePoolsByTags = _poolDao.findZoneWideStoragePoolsByTags(host.getDataCenterId(),
null);
                 List<StoragePoolVO> zoneStoragePoolsByHypervisor = _poolDao.findZoneWideStoragePoolsByHypervisor(host.getDataCenterId(),
scCmd.getHypervisorType());


Mime
View raw message