[cloudstack] branch 4.13 updated: server: Honor vm.destroy.forcestop when expunge a vm (#3965)

[rohit]

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

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


The following commit(s) were added to refs/heads/4.13 by this push:
     new 851534a  server: Honor vm.destroy.forcestop when expunge a vm (#3965)
851534a is described below

commit 851534ac1715af3d0eacd9d81edf85de392c64b5
Author: Wei Zhou <w.z...@global.leaseweb.com>
AuthorDate: Tue Jun 9 04:55:51 2020 +0200

    server: Honor vm.destroy.forcestop when expunge a vm (#3965)
    
    When expunge a Running vm, vm will be stopped with forcestop=false which 
does not make sense. we should honor vm.destroy.forcestop in global setting, or 
always set forcestop=true.
---
 .../src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 c2af76a..aea8cc0 100755
--- 
a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
+++ 
b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -502,7 +502,7 @@ public class VirtualMachineManagerImpl extends ManagerBase 
implements VirtualMac
             return;
         }
 
-        advanceStop(vm.getUuid(), false);
+        advanceStop(vm.getUuid(), VmDestroyForcestop.value());
         vm = _vmDao.findByUuid(vm.getUuid());
 
         try {