HA config dynamic flag changes and some improvements

Author: sureshanaparti

engine/components-api/src/main/java/com/cloud/ha/HighAvailabilityManager.java

@@ -39,7 +39,7 @@ public interface HighAvailabilityManager extends Manager {
         "Force High-Availability to happen even if the VM says no.", true, Cluster);
 
     ConfigKey<Integer> HAWorkers = new ConfigKey<>("Advanced", Integer.class, "ha.workers", "5",
-        "The number of High-Availability worker threads.", true, Cluster);
+        "The number of High-Availability worker threads.", false, Cluster);
 
     ConfigKey<Integer> InvestigateRetryInterval = new ConfigKey<>("Advanced", Integer.class, "investigate.retry.interval",
         "60", "The time (in seconds) between VM pings when the agent is disconnected.", true, Cluster);
@@ -59,12 +59,6 @@ public interface HighAvailabilityManager extends Manager {
         + "that were successful and is now ready to be purged from the database (table: op_ha_work).",
         true, Cluster);
 
-    ConfigKey<Integer> MaxRetries = new ConfigKey<>("Advanced", Integer.class, "max.retries",
-        "5", "The number of times to try a restart for the different Work-Types: "
-        + "Migrating - VMs off of a host, Destroy - a VM, Stop - a VM for storage pool migration purposes,"
-        + " CheckStop - checks if a VM has been stopped, ForceStop - force a VM to stop even if the "
-        + "states don't allow it, Destroy - a VM and HA - restart a VM.", true, Cluster);
-
     ConfigKey<Long> TimeToSleep = new ConfigKey<>("Advanced", Long.class, "time.to.sleep",
         "60", "The time in seconds to sleep before checking the database (table: op_ha_work) "
         + "for new working types (Migration, Stop, CheckStop, ForceStop, Destroy and HA), if no work items are found.",
@@ -76,7 +70,7 @@ public interface HighAvailabilityManager extends Manager {
         true, Cluster);
 
     ConfigKey<Boolean> KvmHAFenceHostIfHeartbeatFailsOnStorage = new ConfigKey<>("Advanced", Boolean.class, "kvm.ha.fence.on.storage.heartbeat.failure", "false",
-            "Proceed fencing the host even the heartbeat failed for only one storage pool", false, ConfigKey.Scope.Zone);
+            "Proceed fencing the host even the heartbeat failed for only one storage pool", true, ConfigKey.Scope.Zone);
 
     enum WorkType {
         Migration,  // Migrating VMs off of a host.

server/src/main/java/org/apache/cloudstack/ha/HAManager.java

@@ -28,43 +28,43 @@ public interface HAManager extends HAConfigManager {
     ConfigKey<Integer> MaxConcurrentHealthCheckOperations = new ConfigKey<>("Advanced", Integer.class,
             "ha.max.concurrent.health.check.operations",
             "50",
-            "The number of concurrent health check operations per management server. This setting determines the size of the thread pool consuming the HEALTH CHECK queue.", true);
+            "The number of concurrent health check operations per management server. This setting determines the size of the thread pool consuming the HEALTH CHECK queue.", false);
 
     ConfigKey<Integer> MaxPendingHealthCheckOperations = new ConfigKey<>("Advanced", Integer.class,
             "ha.max.pending.health.check.operations",
             "5000",
-            "The number of pending health check operations per management server. This setting determines the size of the HEALTH CHECK queue.", true);
+            "The number of pending health check operations per management server. This setting determines the size of the HEALTH CHECK queue.", false);
 
     ConfigKey<Integer> MaxConcurrentActivityCheckOperations = new ConfigKey<>("Advanced", Integer.class,
             "ha.max.concurrent.activity.check.operations",
             "25",
             "The number of concurrent activity check operations per management server. This setting determines the size of the thread pool consuming the ACTIVITY CHECK queue.",
-            true);
+            false);
 
     ConfigKey<Integer> MaxPendingActivityCheckOperations = new ConfigKey<>("Advanced", Integer.class,
             "ha.max.pending.activity.check.operations",
             "2500",
-            "The number of pending activity check operations per management server. This setting determines the size of the size of the ACTIVITY CHECK queue.", true);
+            "The number of pending activity check operations per management server. This setting determines the size of the ACTIVITY CHECK queue.", false);
 
     ConfigKey<Integer> MaxConcurrentRecoveryOperations = new ConfigKey<>("Advanced", Integer.class,
             "ha.max.concurrent.recovery.operations",
             "25",
-            "The number of concurrent recovery operations per management server.", true);
+            "The number of concurrent recovery operations per management server. This setting determines the size of the thread pool consuming the RECOVERY queue.", false);
 
     ConfigKey<Integer> MaxPendingRecoveryOperations = new ConfigKey<>("Advanced", Integer.class,
             "ha.max.pending.recovery.operations",
             "2500",
-            "The number of pending recovery operations per management server. This setting determines the size of the size of the RECOVERY queue.", true);
+            "The number of pending recovery operations per management server. This setting determines the size of the RECOVERY queue.", false);
 
     ConfigKey<Integer> MaxConcurrentFenceOperations = new ConfigKey<>("Advanced", Integer.class,
             "ha.max.concurrent.fence.operations",
             "25",
-            "The number of concurrent fence operations per management server.", true);
+            "The number of concurrent fence operations per management server. This setting determines the size of the thread pool consuming the FENCE queue.", false);
 
     ConfigKey<Integer> MaxPendingFenceOperations = new ConfigKey<>("Advanced", Integer.class,
             "ha.max.pending.fence.operations",
             "2500",
-            "The number of pending fence operations per management server. This setting determines the size of the size of the FENCE queue.", true);
+            "The number of pending fence operations per management server. This setting determines the size of the FENCE queue.", false);
 
     boolean transitionHAState(final HAConfig.Event event, final HAConfig haConfig);