keep maintenance state on trigger shutdown call when ms is in maintenance

Author: sureshanaparti

plugins/maintenance/src/main/java/org/apache/cloudstack/maintenance/ManagementServerMaintenanceManagerImpl.java

@@ -320,6 +320,7 @@ public ManagementServerMaintenanceResponse triggerShutdown(TriggerShutdownCmd cm
 
         if (State.Up.equals(msHost.getState())) {
             msHostDao.updateState(msHost.getId(), State.PreparingForShutDown);
+            msHost.setState(State.PreparingForShutDown);
         }
 
         final Command[] cmds = new Command[1];
@@ -330,7 +331,9 @@ public ManagementServerMaintenanceResponse triggerShutdown(TriggerShutdownCmd cm
             throw new CloudRuntimeException(result);
         }
 
-        msHostDao.updateState(msHost.getId(), State.ShuttingDown);
+        if (!State.Maintenance.equals(msHost.getState())) {
+            msHostDao.updateState(msHost.getId(), State.ShuttingDown);
+        }
         return prepareMaintenanceResponse(cmd.getManagementServerId());
     }
 
@@ -535,7 +538,7 @@ protected void runInContext() {
                 // No more pending jobs. Good to terminate
                 if (managementServerMaintenanceManager.isShutdownTriggered()) {
                     logger.info("MS is Shutting Down Now");
-                    // update state to down ?
+                    // Keeps Maintenance state, Otherwise updates state to ShuttingDown followed by Down
                     System.exit(0);
                 }
                 if (managementServerMaintenanceManager.isPreparingForMaintenance()) {