sureshanaparti commented on code in PR #9008:
URL: https://github.com/apache/cloudstack/pull/9008#discussion_r1584550099
##########
server/src/main/java/com/cloud/vm/UserVmManagerImpl.java:
##########
@@ -8206,21 +8231,20 @@ private void checkRestoreVmFromTemplate(UserVmVO vm,
VMTemplateVO template, List
_resourceLimitMgr.checkVmResourceLimitsForTemplateChange(owner,
vm.isDisplay(), serviceOffering, currentTemplate, template);
}
- Long newSize = newDiskOffering != null ? newDiskOffering.getDiskSize()
: null;
- if (MapUtils.isNotEmpty(details) &&
StringUtils.isNumeric(details.get(VmDetailConstants.ROOT_DISK_SIZE))) {
- newSize =
Long.parseLong(details.get(VmDetailConstants.ROOT_DISK_SIZE)) * GiB_TO_BYTES;
- }
- if (newDiskOffering != null || newSize != null) {
- for (Volume vol : volumes) {
- if (newDiskOffering != null || !vol.getSize().equals(newSize))
{
- DiskOffering currentOffering =
_diskOfferingDao.findById(vol.getDiskOfferingId());
-
_resourceLimitMgr.checkVolumeResourceLimitForDiskOfferingChange(owner,
vol.isDisplay(),
- vol.getSize(), newSize, currentOffering,
newDiskOffering);
- }
+ for (Volume vol : rootVolumes) {
+ Long newSize = getRootVolumeSizeForVmRestore(vol, template, vm,
newDiskOffering, details, false);
+ if (newSize == null) {
+ newSize = vol.getSize();
+ }
+ if (newDiskOffering != null || !vol.getSize().equals(newSize)) {
+ DiskOffering currentOffering =
_diskOfferingDao.findById(vol.getDiskOfferingId());
+
_resourceLimitMgr.checkVolumeResourceLimitForDiskOfferingChange(owner,
vol.isDisplay(),
+ vol.getSize(), newSize, currentOffering,
newDiskOffering);
}
}
}
+
Review Comment:
```suggestion
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
