From 874c7be67bef92955ab59e0ed81edd43111f6e5e Mon Sep 17 00:00:00 2001 From: DK101010 <57522802+DK101010@users.noreply.github.com> Date: Mon, 21 Dec 2020 08:08:38 +0100 Subject: [PATCH] server: add conditions for custom offerings (#4540) Bug/unmanaged ingest exception. Co-authored-by: Dirk Klahre --- server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index 3d447c62e21..df7884c80e3 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -7400,20 +7400,21 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir */ private void postProcessingUnmanageVM(UserVmVO vm) { ServiceOfferingVO offering = _serviceOfferingDao.findById(vm.getServiceOfferingId()); - + Long cpu = offering.getCpu() != null ? new Long(offering.getCpu()) : 0L; + Long ram = offering.getRamSize() != null ? new Long(offering.getRamSize()) : 0L; // First generate a VM stop event if the VM was not stopped already if (vm.getState() != State.Stopped) { UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_STOP, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), vm.getHostName(), vm.getServiceOfferingId(), vm.getTemplateId(), vm.getHypervisorType().toString(), VirtualMachine.class.getName(), vm.getUuid(), vm.isDisplayVm()); - resourceCountDecrement(vm.getAccountId(), vm.isDisplayVm(), new Long(offering.getCpu()), new Long(offering.getRamSize())); + resourceCountDecrement(vm.getAccountId(), vm.isDisplayVm(), cpu, ram); } // VM destroy usage event UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_DESTROY, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), vm.getHostName(), vm.getServiceOfferingId(), vm.getTemplateId(), vm.getHypervisorType().toString(), VirtualMachine.class.getName(), vm.getUuid(), vm.isDisplayVm()); - resourceCountDecrement(vm.getAccountId(), vm.isDisplayVm(), new Long(offering.getCpu()), new Long(offering.getRamSize())); + resourceCountDecrement(vm.getAccountId(), vm.isDisplayVm(), cpu, ram); } /*