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

sureshanaparti · sureshanaparti · commit 4d8e29c0d322 · 2024-12-10T15:27:32.000+05:30
This reverts commit 607e133.
diff --git a/plugins/maintenance/src/main/java/org/apache/cloudstack/maintenance/ManagementServerMaintenanceManagerImpl.java b/plugins/maintenance/src/main/java/org/apache/cloudstack/maintenance/ManagementServerMaintenanceManagerImpl.java
@@ -320,7 +320,6 @@ 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];
@@ -331,9 +330,7 @@ public ManagementServerMaintenanceResponse triggerShutdown(TriggerShutdownCmd cm
             throw new CloudRuntimeException(result);
         }
 
-        if (!State.Maintenance.equals(msHost.getState())) {
-            msHostDao.updateState(msHost.getId(), State.ShuttingDown);
-        }
+        msHostDao.updateState(msHost.getId(), State.ShuttingDown);
         return prepareMaintenanceResponse(cmd.getManagementServerId());
     }
 
@@ -538,7 +535,7 @@ protected void runInContext() {
                 // No more pending jobs. Good to terminate
                 if (managementServerMaintenanceManager.isShutdownTriggered()) {
                     logger.info("MS is Shutting Down Now");
-                    // Keeps Maintenance state, Otherwise updates state to ShuttingDown followed by Down
+                    // update state to down ?
                     System.exit(0);
                 }
                 if (managementServerMaintenanceManager.isPreparingForMaintenance()) {

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,6 @@ public ManagementServerMaintenanceResponse triggerShutdown(TriggerShutdownCmd cm`
`320`	`320`
`321`	`321`	`if (State.Up.equals(msHost.getState())) {`
`322`	`322`	`msHostDao.updateState(msHost.getId(), State.PreparingForShutDown);`
`323`		`- msHost.setState(State.PreparingForShutDown);`
`324`	`323`	`}`
`325`	`324`
`326`	`325`	`final Command[] cmds = new Command[1];`
`@@ -331,9 +330,7 @@ public ManagementServerMaintenanceResponse triggerShutdown(TriggerShutdownCmd cm`
`331`	`330`	`throw new CloudRuntimeException(result);`
`332`	`331`	`}`
`333`	`332`
`334`		`- if (!State.Maintenance.equals(msHost.getState())) {`
`335`		`- msHostDao.updateState(msHost.getId(), State.ShuttingDown);`
`336`		`- }`
	`333`	`+ msHostDao.updateState(msHost.getId(), State.ShuttingDown);`
`337`	`334`	`return prepareMaintenanceResponse(cmd.getManagementServerId());`
`338`	`335`	`}`
`339`	`336`
`@@ -538,7 +535,7 @@ protected void runInContext() {`
`538`	`535`	`// No more pending jobs. Good to terminate`
`539`	`536`	`if (managementServerMaintenanceManager.isShutdownTriggered()) {`
`540`	`537`	`logger.info("MS is Shutting Down Now");`
`541`		`- // Keeps Maintenance state, Otherwise updates state to ShuttingDown followed by Down`
	`538`	`+ // update state to down ?`
`542`	`539`	`System.exit(0);`
`543`	`540`	`}`
`544`	`541`	`if (managementServerMaintenanceManager.isPreparingForMaintenance()) {`