Skip to content

Commit 961ce01

Browse files
author
Abhinandan Prateek
committed
md-ov: resize disk as per service offering
1 parent 5962519 commit 961ce01

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ public Answer cloneVolumeFromBaseTemplate(CopyCommand cmd) {
545545

546546
VolumeObjectTO newVol = new VolumeObjectTO();
547547
newVol.setPath(vmdkFileBaseName);
548-
newVol.setSize(volume.getSize());
548+
newVol.setSize(template.getSize());
549549
return new CopyCmdAnswer(newVol);
550550
} catch (Throwable e) {
551551
if (e instanceof RemoteException) {

server/src/com/cloud/vm/UserVmManagerImpl.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3777,6 +3777,20 @@ protected UserVm startVirtualMachine(DeployVMCmd cmd, Map<VirtualMachineProfile.
37773777
s_logger.error("VM " + tmpVm + " unexpectedly went to " + tmpVm.getState() + " state");
37783778
throw new ConcurrentOperationException("Failed to deploy VM "+vm);
37793779
}
3780+
3781+
if (!cmd.getDataDiskTemplateToDiskOfferingMap().isEmpty()) {
3782+
List<VolumeVO> vols = _volsDao.findByInstance(tmpVm.getId());
3783+
for (VolumeVO vol : vols) {
3784+
if (vol.getVolumeType() == Volume.Type.DATADISK) {
3785+
DiskOffering doff = _entityMgr.findById(DiskOffering.class, vol.getDiskOfferingId());
3786+
s_logger.info("MDOVE resizing disk offering size " + doff.getDiskSize());
3787+
s_logger.info("MDOVE resizing volume " + vol.getName() + " to size " + vol.getSize());
3788+
s_logger.info("MDOVE resizing host id " + tmpVm.getHostId() + " for vm " + tmpVm.getInstanceName() + " last host id " + tmpVm.getLastHostId());
3789+
_volService.resizeVolumeOnHypervisor(vol.getId(), doff.getDiskSize(), tmpVm.getHostId(), vm.getInstanceName());
3790+
}
3791+
}
3792+
}
3793+
37803794
} finally {
37813795
updateVmStateForFailedVmCreation(vm.getId(), hostId);
37823796
}

0 commit comments

Comments
 (0)