code improvements, cleanup

Author: sureshanaparti

api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/PatchSystemVMCmd.java

@@ -46,7 +46,7 @@ public class PatchSystemVMCmd extends BaseAsyncCmd {
     @Parameter(name = ApiConstants.FORCED, type = CommandType.BOOLEAN,
             description = "If true, initiates copy of scripts and restart of the agent, even if the scripts version matches." +
                     "To be used with ID parameter only")
-    private Boolean force;
+    private Boolean forced;
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
@@ -58,7 +58,7 @@ public Long getId() {
     }
 
     public boolean isForced() {
-        return force != null && force;
+        return forced != null && forced;
     }
 
     /////////////////////////////////////////////////////

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

@@ -1456,7 +1456,8 @@ public boolean transferDirectAgentsFromMS(String fromMsUuid, long fromMsId, long
 
     private List<HostVO> getDirectAgentHosts(long msId, boolean excludeHostsInMaintenance) {
         List<HostVO> directAgentHosts = new ArrayList<>();
-        List<HostVO> hosts = _hostDao.listHostsByMsResourceState(msId, null);
+        List<ResourceState> statesToExclude = excludeHostsInMaintenance ? ResourceState.s_maintenanceStates : List.of();
+        List<HostVO> hosts = _hostDao.listHostsByMsResourceState(msId, statesToExclude);
         for (HostVO host : hosts) {
             AgentAttache agent = findAttache(host.getId());
             if (agent instanceof DirectAgentAttache) {

plugins/maintenance/src/main/java/org/apache/cloudstack/api/command/CancelMaintenanceCmd.java

@@ -39,7 +39,7 @@ public class CancelMaintenanceCmd extends BaseMSMaintenanceActionCmd {
 
     public static final String APINAME = "cancelMaintenance";
 
-    @Parameter(name = ApiConstants.REBALANCE, type = CommandType.BOOLEAN, description = "Rebalance agents (applicable for indirect agents) after cancelling maintenance, default is true")
+    @Parameter(name = ApiConstants.REBALANCE, type = CommandType.BOOLEAN, description = "Rebalance agents (applicable for indirect agents, ensure the settings 'host' and 'indirect.agent.lb.algorithm' are properly configured) after cancelling maintenance, default is true")
     private Boolean rebalance;
 
     public boolean getRebalance() {

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

@@ -461,7 +461,7 @@ public ManagementServerMaintenanceResponse cancelMaintenance(CancelMaintenanceCm
         }
 
         final Command[] cmds = new Command[1];
-        cmds[0] = new CancelMaintenanceManagementServerHostCommand(msHost.getMsid(), cmd.getRebalance());
+        cmds[0] = new CancelMaintenanceManagementServerHostCommand(msHost.getMsid());
         executeCmd(msHost, cmds);
 
         msHostDao.updateState(msHost.getId(), State.Up);

plugins/maintenance/src/main/java/org/apache/cloudstack/maintenance/command/CancelMaintenanceManagementServerHostCommand.java

@@ -19,18 +19,8 @@
 package org.apache.cloudstack.maintenance.command;
 
 public class CancelMaintenanceManagementServerHostCommand extends BaseShutdownManagementServerHostCommand {
-    boolean rebalance;
 
     public CancelMaintenanceManagementServerHostCommand(long msId) {
         super(msId);
     }
-
-    public CancelMaintenanceManagementServerHostCommand(long msId, boolean rebalance) {
-        super(msId);
-        this.rebalance = rebalance;
-    }
-
-    public boolean getRebalance() {
-        return rebalance;
-    }
 }

server/src/main/java/org/apache/cloudstack/agent/lb/IndirectAgentLBServiceImpl.java

@@ -360,7 +360,7 @@ public void propagateMSListToAgentsInCluster(Long clusterId) {
             return;
         }
 
-        logger.debug("Propagating management server list to the agents in cluster " + clusterId);
+        logger.debug("Propagating management server list update to the agents in cluster " + clusterId);
         ClusterVO cluster = clusterDao.findById(clusterId);
         if (cluster == null) {
             logger.warn("Unable to propagate management server list, couldn't find cluster " + clusterId);