From 3bf4b14b577646a37c4e8b8d89575b0913acafd7 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 10 Jun 2021 18:10:52 +0530 Subject: [PATCH] server: fix scale for dummy template ingested vm For vm import, dummy template can be used - https://docs.cloudstack.apache.org/en/latest/adminguide/virtual_machines.html#dummy-template Named as system-default-vm-import-dummy-template.iso, the template is marked as removed in the CloudStack DB. For scale operation while trying to find vm template, server needs to find in all templates including removed. Fixes #5096 Signed-off-by: Abhishek Kumar --- .../src/main/java/com/cloud/storage/VolumeApiServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java index 08c473b60b12..132149ffcf44 100644 --- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java @@ -924,8 +924,8 @@ public VolumeVO resizeVolume(ResizeVolumeCmd cmd) throws ResourceAllocationExcep if (newDiskOffering == null) { Long templateId = volume.getTemplateId(); if (templateId != null) { - VMTemplateVO template = _templateDao.findById(templateId); - format = template.getFormat(); + VMTemplateVO template = _templateDao.findByIdIncludingRemoved(templateId); + format = template != null ? template.getFormat() : null; } if (volume.getVolumeType().equals(Volume.Type.ROOT) && diskOffering.getDiskSize() > 0 && format != null && format != ImageFormat.ISO) {