cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From devd...@apache.org
Subject [1/3] git commit: updated refs/heads/master to b43036d
Date Fri, 13 Jun 2014 08:33:14 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 8e0aba460 -> b43036d10


CLOUDSTACK-6865 , CLOUDSTACK-6868: [hyperv] while attaching the volume we were changing the
volume's Image format to hypervisor's default Image format, hence it was failing to find the
volume with vhdx format. Now changed the behavior to set Image Format for volume only when
it is not set


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

Branch: refs/heads/master
Commit: 66d1eb92f03c39734dcaf83e20639cd9a338e388
Parents: 8e0aba4
Author: Anshul Gangwar <anshul.gangwar@citrix.com>
Authored: Tue Jun 10 16:28:32 2014 +0530
Committer: Devdeep Singh <devdeep@gmail.com>
Committed: Fri Jun 13 13:26:02 2014 +0530

----------------------------------------------------------------------
 .../cloudstack/engine/orchestration/VolumeOrchestrator.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66d1eb92/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
index 6256e25..3cf8c6c 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -773,7 +773,9 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
             throw new CloudRuntimeException("Volume shouldn't be null " + volume.getId());
         }
         VolumeVO volVO = _volsDao.findById(vol.getId());
-        volVO.setFormat(getSupportedImageFormatForCluster(rootDiskHyperType));
+        if (volVO.getFormat() == null) {
+            volVO.setFormat(getSupportedImageFormatForCluster(rootDiskHyperType));
+        }
         _volsDao.update(volVO.getId(), volVO);
         return volFactory.getVolume(volVO.getId());
     }


Mime
View raw message