From caa8c8183b500f438f08160537473cd4c4b83385 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Mon, 12 May 2025 17:32:43 +0530 Subject: [PATCH] move change ownership logic --- 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 c5cf24a505f..ef62718a9e1 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -7592,9 +7592,6 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir removeInstanceFromInstanceGroup(vm.getId()); Long newAccountId = newAccount.getAccountId(); - updateVmOwner(newAccount, vm, domainId, newAccountId); - - updateVolumesOwner(volumes, oldAccount, newAccount, newAccountId); AtomicBoolean isNetworkAutoCreated = new AtomicBoolean(false); try { updateVmNetwork(cmd, caller, vm, newAccount, template, isNetworkAutoCreated); @@ -7606,6 +7603,10 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir throw new CloudRuntimeException(String.format("Unable to update networks when assigning VM [%s] due to [%s].", vm, e.getMessage()), e); } + updateVmOwner(newAccount, vm, domainId, newAccountId); + + updateVolumesOwner(volumes, oldAccount, newAccount, newAccountId); + logger.trace(String.format("Incrementing new account [%s] resource count.", newAccount)); if (!isResourceCountRunningVmsOnlyEnabled()) { resourceCountIncrement(newAccountId, vm.isDisplayVm(), offering, template);