dont use forced: true for StopVmCmd

Author: sudo87

server/src/main/java/org/apache/cloudstack/vm/lease/VMLeaseManagerImpl.java

@@ -288,11 +288,11 @@ Long executeExpiryAction(UserVmJoinVO instance, ExpiryAction expiryAction, long
         switch (expiryAction) {
             case STOP: {
                 logger.debug("Stopping instance: {} (id: {}) on lease expiry", instance.getName(), instance.getUuid());
-                return executeStopInstanceJob(instance, true, eventId);
+                return executeStopInstanceJob(instance, eventId);
             }
             case DESTROY: {
                 logger.debug("Destroying instance: {} (id: {}) on lease expiry", instance.getName(), instance.getUuid());
-                return executeDestroyInstanceJob(instance, true, eventId);
+                return executeDestroyInstanceJob(instance, eventId);
             }
             default: {
                 logger.error("Invalid configuration for instance.lease.expiryaction for instance: {} (id: {}), " +
@@ -302,13 +302,12 @@ Long executeExpiryAction(UserVmJoinVO instance, ExpiryAction expiryAction, long
         return null;
     }
 
-    long executeStopInstanceJob(UserVmJoinVO vm, boolean isForced, long eventId) {
+    long executeStopInstanceJob(UserVmJoinVO vm, long eventId) {
         final Map<String, String> params = new HashMap<>();
         params.put(ApiConstants.ID, String.valueOf(vm.getId()));
         params.put("ctxUserId", String.valueOf(User.UID_SYSTEM));
         params.put("ctxAccountId", String.valueOf(Account.ACCOUNT_ID_SYSTEM));
         params.put(ApiConstants.CTX_START_EVENT_ID, String.valueOf(eventId));
-        params.put(ApiConstants.FORCED, String.valueOf(isForced));
         params.put(JOB_INITIATOR, VMLeaseManager.class.getSimpleName());
         final StopVMCmd cmd = new StopVMCmd();
         ComponentContext.inject(cmd);
@@ -318,13 +317,12 @@ long executeStopInstanceJob(UserVmJoinVO vm, boolean isForced, long eventId) {
         return asyncJobManager.submitAsyncJob(job);
     }
 
-    long executeDestroyInstanceJob(UserVmJoinVO vm, boolean isForced, long eventId) {
+    long executeDestroyInstanceJob(UserVmJoinVO vm, long eventId) {
         final Map<String, String> params = new HashMap<>();
         params.put(ApiConstants.ID, String.valueOf(vm.getId()));
         params.put("ctxUserId", String.valueOf(User.UID_SYSTEM));
         params.put("ctxAccountId", String.valueOf(Account.ACCOUNT_ID_SYSTEM));
         params.put(ApiConstants.CTX_START_EVENT_ID, String.valueOf(eventId));
-        params.put(ApiConstants.FORCED, String.valueOf(isForced));
         params.put(JOB_INITIATOR, VMLeaseManager.class.getSimpleName());
         final DestroyVMCmd cmd = new DestroyVMCmd();
         ComponentContext.inject(cmd);

server/src/test/java/org/apache/cloudstack/vm/lease/VMLeaseManagerImplTest.java

@@ -145,14 +145,14 @@ public void testReallyRunStopAction() {
         List<UserVmJoinVO> expiredVms = Arrays.asList(vm);
         when(userVmJoinDao.listEligibleInstancesWithExpiredLease()).thenReturn(expiredVms);
         when(userVmJoinDao.findById(1L)).thenReturn(vm);
-        doReturn(1L).when(vmLeaseManager).executeStopInstanceJob(eq(vm), eq(true), anyLong());
+        doReturn(1L).when(vmLeaseManager).executeStopInstanceJob(eq(vm), anyLong());
         try (MockedStatic<ActionEventUtils> utilities = Mockito.mockStatic(ActionEventUtils.class)) {
             utilities.when(() -> ActionEventUtils.onStartedActionEvent(Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString(),
                     Mockito.anyString(), Mockito.anyLong(), Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyLong())).thenReturn(1L);
 
             vmLeaseManager.reallyRun();
         }
-        verify(vmLeaseManager).executeStopInstanceJob(eq(vm), eq(true), anyLong());
+        verify(vmLeaseManager).executeStopInstanceJob(eq(vm), anyLong());
     }
 
     @Test
@@ -161,33 +161,33 @@ public void testReallyRunDestroyAction() {
         List<UserVmJoinVO> expiredVms = Arrays.asList(vm);
         when(userVmJoinDao.listEligibleInstancesWithExpiredLease()).thenReturn(expiredVms);
         when(userVmJoinDao.findById(1L)).thenReturn(vm);
-        doReturn(1L).when(vmLeaseManager).executeDestroyInstanceJob(eq(vm), eq(true), anyLong());
+        doReturn(1L).when(vmLeaseManager).executeDestroyInstanceJob(eq(vm), anyLong());
         try (MockedStatic<ActionEventUtils> utilities = Mockito.mockStatic(ActionEventUtils.class)) {
             utilities.when(() -> ActionEventUtils.onStartedActionEvent(Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString(),
                     Mockito.anyString(), Mockito.anyLong(), Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyLong())).thenReturn(1L);
             vmLeaseManager.reallyRun();
         }
-        verify(vmLeaseManager).executeDestroyInstanceJob(eq(vm), eq(true), anyLong());
+        verify(vmLeaseManager).executeDestroyInstanceJob(eq(vm), anyLong());
     }
 
     @Test
     public void testExecuteExpiryActionStop() {
         UserVmJoinVO vm = createMockVm(1L, VM_UUID, VM_NAME, VirtualMachine.State.Running, false);
-        doReturn(1L).when(vmLeaseManager).executeStopInstanceJob(eq(vm), eq(true), eq(123L));
+        doReturn(1L).when(vmLeaseManager).executeStopInstanceJob(eq(vm), eq(123L));
         Long jobId = vmLeaseManager.executeExpiryAction(vm, VMLeaseManager.ExpiryAction.STOP, 123L);
         assertNotNull(jobId);
         assertEquals(1L, jobId.longValue());
-        verify(vmLeaseManager).executeStopInstanceJob(eq(vm), eq(true), eq(123L));
+        verify(vmLeaseManager).executeStopInstanceJob(eq(vm), eq(123L));
     }
 
     @Test
     public void testExecuteExpiryActionDestroy() {
         UserVmJoinVO vm = createMockVm(1L, VM_UUID, VM_NAME, VirtualMachine.State.Running, false, DESTROY);
-        doReturn(1L).when(vmLeaseManager).executeDestroyInstanceJob(eq(vm), eq(true), eq(123L));
+        doReturn(1L).when(vmLeaseManager).executeDestroyInstanceJob(eq(vm), eq(123L));
         Long jobId = vmLeaseManager.executeExpiryAction(vm, VMLeaseManager.ExpiryAction.DESTROY, 123L);
         assertNotNull(jobId);
         assertEquals(1L, jobId.longValue());
-        verify(vmLeaseManager).executeDestroyInstanceJob(eq(vm), eq(true), eq(123L));
+        verify(vmLeaseManager).executeDestroyInstanceJob(eq(vm), eq(123L));
     }
 
     @Test
@@ -198,7 +198,7 @@ public void testExecuteStopInstanceJob() {
             ApplicationContext mockAppContext = mock(ApplicationContext.class);
             mockedComponentContext.when(ComponentContext::getApplicationContext).thenReturn(mockAppContext);
             mockedComponentContext.when(() -> ComponentContext.inject(any())).thenReturn(true);
-            long jobId = vmLeaseManager.executeStopInstanceJob(vm, true, 123L);
+            long jobId = vmLeaseManager.executeStopInstanceJob(vm, 123L);
             assertEquals(1L, jobId);
             ArgumentCaptor<AsyncJobVO> jobCaptor = ArgumentCaptor.forClass(AsyncJobVO.class);
             verify(asyncJobManager).submitAsyncJob(jobCaptor.capture());
@@ -218,7 +218,7 @@ public void testExecuteDestroyInstanceJob() {
             ApplicationContext mockAppContext = mock(ApplicationContext.class);
             mockedComponentContext.when(ComponentContext::getApplicationContext).thenReturn(mockAppContext);
             mockedComponentContext.when(() -> ComponentContext.inject(any())).thenReturn(true);
-            long jobId = vmLeaseManager.executeDestroyInstanceJob(vm, true, 123L);
+            long jobId = vmLeaseManager.executeDestroyInstanceJob(vm, 123L);
             assertEquals(1L, jobId);
             ArgumentCaptor<AsyncJobVO> jobCaptor = ArgumentCaptor.forClass(AsyncJobVO.class);
             verify(asyncJobManager).submitAsyncJob(jobCaptor.capture());