cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject git commit: updated refs/heads/master to 789ac14
Date Wed, 07 Aug 2013 03:37:06 GMT
Updated Branches:
  refs/heads/master c14c736d7 -> 789ac14c1


Summary: CLOUDSTACK-4121 fix local storage volume deployment

Detail: Fix hypervisor type lookup for local storage volumes by
adding in a statement for the 'HOST' storage scope.

Reviewed-by: Rajesh Battala


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

Branch: refs/heads/master
Commit: 789ac14c14fe3d37c1b49b6d0b32a6ee01f0017e
Parents: c14c736
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Tue Aug 6 21:34:22 2013 -0600
Committer: Marcus Sorensen <marcus@betterservers.com>
Committed: Tue Aug 6 21:37:11 2013 -0600

----------------------------------------------------------------------
 engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/789ac14c/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
index 273f7f9..efe41c9 100755
--- a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
+++ b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
@@ -242,10 +242,12 @@ public class VolumeDaoImpl extends GenericDaoBase<VolumeVO, Long>
implements Vol
         try {
             ScopeType scope = getVolumeStoragePoolScope(volumeId);
             if (scope != null ) {
-                if (scope == ScopeType.CLUSTER)
+                if (scope == ScopeType.CLUSTER || scope == ScopeType.HOST)
                     sql = SELECT_HYPERTYPE_FROM_CLUSTER_VOLUME;
                 else if (scope == ScopeType.ZONE)
                     sql = SELECT_HYPERTYPE_FROM_ZONE_VOLUME;
+                else
+                    s_logger.error("Unhandled scope type '" + scope + "' when running getHypervisorType
on volume id " + volumeId);
 
                 pstmt = txn.prepareAutoCloseStatement(sql);
                 pstmt.setLong(1, volumeId);


Mime
View raw message