[CSTACKEX-204] Duration Changes

Author: Gupta, Surya

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/asup/OntapAsupManager.java

@@ -84,12 +84,11 @@ public class OntapAsupManager extends ManagerBase {
     private static final int ASUP_LOCK_TIMEOUT_SECONDS = 5;
 
     /**
-     * Fixed wakeup interval (ms) for {@link OntapAsupPollTask}. The task wakes on this cadence
-     * and checks whether the configured push interval
-     * ({@link OntapConfigurationManager#AsupIntervalSeconds})
-     * has elapsed. This decouples the scheduler's fixed delay from the live config value,
-     * so changes made in the CloudStack UI take effect without a management-server restart
-     * (within one wakeup).
+     * Fixed wakeup interval (ms) for {@link OntapAsupPollTask} (2 hours). The task wakes on
+     * this cadence and checks whether the live configured push interval
+     * ({@link OntapConfigurationManager#AsupIntervalSeconds}) has elapsed. UI edits of that
+     * interval are applied immediately via the configuration-edit event; this delay is only
+     * the background check so a due push is still noticed with no UI click.
      */
     static final long ASUP_POLL_CHECK_INTERVAL_MS =
             TimeUnit.SECONDS.toMillis(OntapStorageConstants.ASUP_POLL_CHECK_INTERVAL_SECONDS);
@@ -307,11 +306,10 @@ protected void pushAsupForStoragePool(StoragePoolVO pool, Set<String> clustersHe
 
     /**
      * Builds the heartbeat (event-id 0) description as a JSON object carrying the CloudStack and
-     * ONTAP versions, the management-server operating system platform, the ONTAP cluster UUID,
-     * and whether this plugin can snapshot a VM whose disks span multiple ONTAP pools.
+     * ONTAP versions, the management-server operating system platform, and the ONTAP cluster UUID.
      * Example: {@code {"message":"CloudStack connected to ONTAP cluster","cloudstackVersion":
      * "4.23.0.0","platform":"Linux 5.15.0-91-generic (amd64)","ontapVersion":"9.17.1",
-     * "clusterUuid":"...","managementServerCount":2,"snapshot_across_pool":true}}
+     * "clusterUuid":"...","managementServerCount":2}}
      */
     private String buildHeartbeatDescription(String cloudStackVersion, String ontapVersion,
             String clusterUuid) {

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/OntapStorageConstants.java

@@ -165,21 +165,20 @@ public class OntapStorageConstants {
     public static final String ASUP_ENABLED_CONFIG_KEY = "ontap.asup.enabled";
     public static final String ASUP_ENABLED_DEFAULT = "true";
     public static final String ASUP_INTERVAL_CONFIG_KEY = "ontap.asup.interval";
-    public static final int ASUP_MIN_INTERVAL_SECONDS = 60; // 1 minute
+    public static final int ASUP_MIN_INTERVAL_SECONDS = 10800; // 3 hours
     public static final int ASUP_MAX_INTERVAL_SECONDS = 86400; // 24 hours
     public static final int ASUP_DEFAULT_INTERVAL_SECONDS = 43200; // 12 hours (twice a day)
 
-    /** Wakeup cadence of the ASUP poll task; also the upper bound on how long a config change takes to apply. */
-    public static final int ASUP_POLL_CHECK_INTERVAL_SECONDS = 60; // 1 minute
-
     /**
-     * Global Settings shows a generic "takes effect within 30 seconds" toast for every dynamic
-     * key (the config cache TTL). The ASUP keys are only re-read once per poll wakeup, so the
-     * descriptions state the real bound.
+     * Fixed wakeup cadence of {@code OntapAsupPollTask}. Must stay at or below
+     * {@link #ASUP_MIN_INTERVAL_SECONDS} so a due push cannot be missed by more than this
+     * window. Config edits are applied immediately via the configuration-edit event; this
+     * delay is only the background check, not the ASUP push interval.
      */
-    private static final String ASUP_CONFIG_APPLY_NOTE = String.format(
-            "Applied on the next ASUP poll check (within %d seconds); no management server restart required.",
-            ASUP_POLL_CHECK_INTERVAL_SECONDS);
+    public static final int ASUP_POLL_CHECK_INTERVAL_SECONDS = 7200; // 2 hours
+
+    private static final String ASUP_CONFIG_APPLY_NOTE =
+            "Takes effect immediately; no management server restart required.";
 
     public static final String ASUP_ENABLED_DESCRIPTION = "Enable periodic ASUP (AutoSupport) telemetry push from the "
             + "CloudStack ONTAP plugin to the ONTAP cluster. Set to true to enable or false to disable. "

plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/asup/OntapAsupManagerTest.java

@@ -158,8 +158,6 @@ void pushAsupForStoragePool_newCluster_sendsHeartbeatThenPoolMessage() {
         List<EmsApplicationLog> msgs = cap.getAllValues();
         assertEquals(OntapStorageConstants.ASUP_EVENT_ID_HEARTBEAT,    msgs.get(0).getEventId());
         assertEquals(OntapStorageConstants.ASUP_EVENT_ID_STORAGE_POOL, msgs.get(1).getEventId());
-        assertTrue(msgs.get(0).getEventDescription().contains("\"snapshot_across_pool\":true"),
-                msgs.get(0).getEventDescription());
         assertTrue(msgs.get(0).getEventDescription().contains("\"managementServerCount\":0"),
                 msgs.get(0).getEventDescription());
     }