handle cleanupExtraConfig separately

shwstppr · shwstppr · commit c3b601239827 · 2026-01-28T17:51:57.000+05:30
Signed-off-by: Abhishek Kumar &lt;abhishek.mrt22@gmail.com&gt;
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -2999,8 +2999,8 @@ public UserVm updateVirtualMachine(UpdateVMCmd cmd) throws ResourceUnavailableEx
                 vmInstance.setDetails(details);
                 _vmDao.saveDetails(vmInstance);
             }
-            updateVmExtraConfig(userVm, extraConfig, cleanupExtraConfig);
         }
+        updateVmExtraConfig(userVm, extraConfig, cleanupExtraConfig);
 
         if (VMLeaseManager.InstanceLeaseEnabled.value() && cmd.getLeaseDuration() != null) {
             applyLeaseOnUpdateInstance(vmInstance, cmd.getLeaseDuration(), cmd.getLeaseExpiryAction());

Original file line number	Diff line number	Diff line change
`@@ -2999,8 +2999,8 @@ public UserVm updateVirtualMachine(UpdateVMCmd cmd) throws ResourceUnavailableEx`
`2999`	`2999`	`vmInstance.setDetails(details);`
`3000`	`3000`	`_vmDao.saveDetails(vmInstance);`
`3001`	`3001`	`}`
`3002`		`- updateVmExtraConfig(userVm, extraConfig, cleanupExtraConfig);`
`3003`	`3002`	`}`
	`3003`	`+ updateVmExtraConfig(userVm, extraConfig, cleanupExtraConfig);`
`3004`	`3004`
`3005`	`3005`	`if (VMLeaseManager.InstanceLeaseEnabled.value() && cmd.getLeaseDuration() != null) {`
`3006`	`3006`	`applyLeaseOnUpdateInstance(vmInstance, cmd.getLeaseDuration(), cmd.getLeaseExpiryAction());`