Do not consider transitional states (Starting, Stopping) to check power state sync

Author: sureshanaparti

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -2214,7 +2214,7 @@ private void advanceStop(final VMInstanceVO vm, final boolean cleanUpEvenIfUnabl
 
                     if (ResourceCountRunningVMsonly.value()) {
                         ServiceOfferingVO offering = _offeringDao.findById(vm.getId(), vm.getServiceOfferingId());
-                        resourceCountDecrement(vm.getAccountId(),new Long(offering.getCpu()), new Long(offering.getRamSize()));
+                        resourceCountDecrement(vm.getAccountId(), offering.getCpu().longValue(), offering.getRamSize().longValue());
                     }
                 }
             } else {

engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java

@@ -932,23 +932,12 @@ public Boolean doInTransaction(TransactionStatus status) {
     }
 
     private boolean isPowerStateInSyncWithInstanceState(final VirtualMachine.PowerState powerState, final long powerHostId, final VMInstanceVO instance) {
-        switch (instance.getState()) {
-            case Starting:
-            case Running:
-                if (powerState == VirtualMachine.PowerState.PowerOff) {
-                    s_logger.debug(String.format("VM id: %d on host id: %d and power host id: %d is in %s state, but power state is %s",
-                            instance.getId(), instance.getHostId(), powerHostId, instance.getState(), powerState));
-                    return false;
-                }
-                break;
-            case Stopping:
-            case Stopped:
-                if (powerState == VirtualMachine.PowerState.PowerOn) {
-                    s_logger.debug(String.format("VM id: %d on host id: %d and power host id: %d is in %s state, but power state is %s",
-                            instance.getId(), instance.getHostId(), powerHostId, instance.getState(), powerState));
-                    return false;
-                }
-                break;
+        State instanceState = instance.getState();
+        if ((powerState == VirtualMachine.PowerState.PowerOff && instanceState == State.Running)
+                || (powerState == VirtualMachine.PowerState.PowerOn && instanceState == State.Stopped)) {
+            s_logger.debug(String.format("VM id: %d on host id: %d and power host id: %d is in %s state, but power state is %s",
+                    instance.getId(), instance.getHostId(), powerHostId, instanceState, powerState));
+            return false;
         }
         return true;
     }