CLOUDSTACK-8491: Host maintenance fails if a vm on it is running a custom service offering VM

abhinandanprateek · abhinandanprateek · commit 4222364beabb · 2015-05-21T10:56:33.000+05:30
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -2358,7 +2358,8 @@ private void orchestrateMigrateAway(final String vmUuid, final long srcHostId, f
             throw new CloudRuntimeException("Unable to find " + vmUuid);
         }
 
-        final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);
+        ServiceOfferingVO offeringVO = _offeringDao.findById(vm.getId(), vm.getServiceOfferingId());
+        final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm, null, offeringVO, null, null);
 
         final Long hostId = vm.getHostId();
         if (hostId == null) {

Original file line number	Diff line number	Diff line change
`@@ -2358,7 +2358,8 @@ private void orchestrateMigrateAway(final String vmUuid, final long srcHostId, f`
`2358`	`2358`	`throw new CloudRuntimeException("Unable to find " + vmUuid);`
`2359`	`2359`	`}`
`2360`	`2360`
`2361`		`- final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm);`
	`2361`	`+ ServiceOfferingVO offeringVO = _offeringDao.findById(vm.getId(), vm.getServiceOfferingId());`
	`2362`	`+ final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm, null, offeringVO, null, null);`
`2362`	`2363`
`2363`	`2364`	`final Long hostId = vm.getHostId();`
`2364`	`2365`	`if (hostId == null) {`