fixes

Author: sureshanaparti

engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java

@@ -675,6 +675,7 @@ protected AgentAttache notifyMonitorsOfConnection(final AgentAttache attache, fi
     public boolean start() {
         ManagementServerHostVO msHost = _mshostDao.findByMsid(_nodeId);
         if (msHost != null && (ManagementServerHost.State.Maintenance.equals(msHost.getState()) || ManagementServerHost.State.PreparingForMaintenance.equals(msHost.getState()))) {
+            _monitorExecutor.shutdownNow();
             return true;
         }
 

engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java

@@ -184,6 +184,13 @@ public boolean start() {
         _timer.schedule(new DirectAgentScanTimerTask(), STARTUP_DELAY, ScanInterval.value());
         logger.debug("Scheduled direct agent scan task to run at an interval of {} seconds", ScanInterval.value());
 
+        ManagementServerHostVO msHost = _mshostDao.findByMsid(_nodeId);
+        if (msHost != null && (ManagementServerHost.State.Maintenance.equals(msHost.getState()) || ManagementServerHost.State.PreparingForMaintenance.equals(msHost.getState()))) {
+            s_transferExecutor.shutdownNow();
+            cleanupTransferMap(_nodeId);
+            return true;
+        }
+
         // Schedule tasks for agent rebalancing
         if (isAgentRebalanceEnabled()) {
             cleanupTransferMap(_nodeId);

ui/src/components/page/GlobalLayout.vue

@@ -87,7 +87,7 @@
         <!-- layout header -->
         <a-affix style="z-index: 100">
           <global-header
-            :style="this.$store.getters.shutdownTriggered ? 'margin-top: 25px;' : null"
+            :style="this.$store.getters.maintenanceInitiated || this.$store.getters.shutdownTriggered ? 'margin-top: 25px;' : null"
             :mode="layoutMode"
             :menus="menus"
             :theme="navTheme"