(cloudstack) branch 4.18 updated: server: fix debug message when expunge a vm (#8374)

[shwstppr]

This is an automated email from the ASF dual-hosted git repository.

shwstppr pushed a commit to branch 4.18
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.18 by this push:
     new 9d3a7be4dd9 server: fix debug message when expunge a vm (#8374)
9d3a7be4dd9 is described below

commit 9d3a7be4dd9f68acab05ba28f89e1467622205b8
Author: Wei Zhou <weiz...@apache.org>
AuthorDate: Thu Dec 21 09:47:57 2023 +0100

    server: fix debug message when expunge a vm (#8374)
    
    This PR fixes the debug message when expunge a vm
---
 .../main/java/com/cloud/vm/VirtualMachineManagerImpl.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
 
b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
index 4c8883476a2..a49609fc374 100755
--- 
a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
+++ 
b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -602,7 +602,7 @@ public class VirtualMachineManagerImpl extends ManagerBase 
implements VirtualMac
     protected void advanceExpunge(VMInstanceVO vm) throws 
ResourceUnavailableException, OperationTimedoutException, 
ConcurrentOperationException {
         if (vm == null || vm.getRemoved() != null) {
             if (s_logger.isDebugEnabled()) {
-                s_logger.debug("Unable to find vm or vm is destroyed: " + vm);
+                s_logger.debug("Unable to find vm or vm is expunged: " + vm);
             }
             return;
         }
@@ -612,17 +612,17 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 
         try {
             if (!stateTransitTo(vm, VirtualMachine.Event.ExpungeOperation, 
vm.getHostId())) {
-                s_logger.debug("Unable to destroy the vm because it is not in 
the correct state: " + vm);
-                throw new CloudRuntimeException("Unable to destroy " + vm);
+                s_logger.debug("Unable to expunge the vm because it is not in 
the correct state: " + vm);
+                throw new CloudRuntimeException("Unable to expunge " + vm);
 
             }
         } catch (final NoTransitionException e) {
-            s_logger.debug("Unable to destroy the vm because it is not in the 
correct state: " + vm);
-            throw new CloudRuntimeException("Unable to destroy " + vm, e);
+            s_logger.debug("Unable to expunge the vm because it is not in the 
correct state: " + vm);
+            throw new CloudRuntimeException("Unable to expunge " + vm, e);
         }
 
         if (s_logger.isDebugEnabled()) {
-            s_logger.debug("Destroying vm " + vm);
+            s_logger.debug("Expunging vm " + vm);
         }
 
         final VirtualMachineProfile profile = new 
VirtualMachineProfileImpl(vm);