From a951b51523069e72e5cd1e503df11b9370b6d6d8 Mon Sep 17 00:00:00 2001 From: Anshul Gangwar Date: Tue, 10 Jun 2014 16:28:32 +0530 Subject: [PATCH] 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 (cherry picked from commit ebff469b46551f8613013e80aa0386203a9c7912) --- .../cloudstack/engine/orchestration/VolumeOrchestrator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 b6fecfb6e07..358b3bd35bd 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java @@ -746,7 +746,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()); }