[CSTACKEX-204] ASUP Changes without restart

Author: Gupta, Surya

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

@@ -49,6 +49,8 @@
 
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
+import java.time.Duration;
+import java.time.Instant;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -84,11 +86,19 @@ public class OntapAsupManager extends ManagerBase implements Configurable {
             OntapStorageConstants.ASUP_INTERVAL_CONFIG_KEY,
             String.valueOf(OntapStorageConstants.ASUP_DEFAULT_INTERVAL_SECONDS),
             OntapStorageConstants.ASUP_INTERVAL_DESCRIPTION,
-            false, ConfigKey.Scope.Global);
+            true, ConfigKey.Scope.Global);
 
     /** Time (in seconds) to wait while acquiring the single-emitter global lock. */
     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 #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.
+     */
+    static final long ASUP_POLL_CHECK_INTERVAL_MS = 60_000L;
+
     /**
      * Volume states that guarantee a physical object exists on the ONTAP FlexVolume.
      * States like {@link Volume.State#Allocated} have a CloudStack DB row pointing to this
@@ -109,6 +119,13 @@ public class OntapAsupManager extends ManagerBase implements Configurable {
     /** Serializes the structured event-description payloads to JSON. */
     private final ObjectMapper objectMapper = new ObjectMapper();
 
+    /**
+     * Timestamp of the last successful ASUP push. Starts at {@link Instant#EPOCH} so the
+     * very first wakeup always fires immediately. {@code volatile} ensures the poll-task
+     * thread's write is visible without synchronization overhead.
+     */
+    volatile Instant lastPushTime = Instant.EPOCH;
+
     @Inject
     private PrimaryDataStoreDao storagePoolDao;
     @Inject
@@ -510,13 +527,26 @@ public ConfigKey<?>[] getConfigKeys() {
     /**
      * Background poll task that runs the ASUP push within a managed CloudStack context.
      *
-     * <p>Submitted once to the shared {@link BackgroundPollManager} during the configure-phase;
-     * the poll manager owns the thread and invokes this task every {@link #getDelay()} ms.</p>
+     * <p>Wakes every {@link #ASUP_POLL_CHECK_INTERVAL_MS} ms. On each wakeup it reads
+     * the live value of {@link #AsupIntervalSeconds} and only pushes if enough time has
+     * elapsed since {@link #lastPushTimeMs}. This means changing the interval in the
+     * CloudStack UI takes effect within one check cycle — no restart required.</p>
      */
     protected class OntapAsupPollTask extends ManagedContextRunnable implements BackgroundPollTask {
         @Override
         protected void runInContext() {
             try {
+                int intervalSeconds = AsupIntervalSeconds.value() != null
+                        ? AsupIntervalSeconds.value() : OntapStorageConstants.ASUP_DEFAULT_INTERVAL_SECONDS;
+                if (intervalSeconds <= 0) {
+                    intervalSeconds = OntapStorageConstants.ASUP_DEFAULT_INTERVAL_SECONDS;
+                }
+                Duration configuredInterval = Duration.ofSeconds(intervalSeconds);
+                Instant now = Instant.now();
+                if (Duration.between(lastPushTime, now).compareTo(configuredInterval) < 0) {
+                    return; // configured interval has not elapsed yet
+                }
+                lastPushTime = now;
                 pushAsupForAllStoragePools();
             } catch (Exception e) {
                 logger.warn("ONTAP ASUP: unexpected error during periodic push: {}", e.getMessage());
@@ -525,12 +555,7 @@ protected void runInContext() {
 
         @Override
         public Long getDelay() {
-            int intervalSeconds = AsupIntervalSeconds.value() != null
-                    ? AsupIntervalSeconds.value() : OntapStorageConstants.ASUP_DEFAULT_INTERVAL_SECONDS;
-            if (intervalSeconds <= 0) {
-                intervalSeconds = OntapStorageConstants.ASUP_DEFAULT_INTERVAL_SECONDS;
-            }
-            return intervalSeconds * 1000L;
+            return ASUP_POLL_CHECK_INTERVAL_MS;
         }
     }
 }

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

@@ -44,6 +44,7 @@
 import org.mockito.MockedStatic;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -420,14 +421,43 @@ void allMessages_haveCorrectEnvelopeFields() {
 
     @Test
     void asupIntervalSeconds_defaultIsProductionValue() {
-        assertEquals("120", OntapAsupManager.AsupIntervalSeconds.defaultValue());
+        assertEquals(String.valueOf(OntapStorageConstants.ASUP_DEFAULT_INTERVAL_SECONDS),
+                OntapAsupManager.AsupIntervalSeconds.defaultValue());
     }
 
     @Test
     void asupEnabled_defaultIsTrue() {
         assertEquals("true", OntapAsupManager.AsupEnabled.defaultValue());
     }
 
+    // ──────────────────────────────────────────────────────────────────────────
+    // OntapAsupPollTask – self-throttle (interval change takes effect without restart)
+    // ──────────────────────────────────────────────────────────────────────────
+
+    @Test
+    void pollTask_getDelay_returnsFixedCheckInterval() {
+        OntapAsupManager.OntapAsupPollTask task = asupManager.new OntapAsupPollTask();
+        assertEquals(OntapAsupManager.ASUP_POLL_CHECK_INTERVAL_MS, task.getDelay());
+    }
+
+    @Test
+    void pollTask_skipsWhenIntervalNotElapsed() {
+        asupManager.lastPushTime = Instant.now(); // just pushed
+        OntapAsupManager.OntapAsupPollTask task = asupManager.new OntapAsupPollTask();
+        task.run();
+        verify(storagePoolDao, never()).findPoolsByProvider(any());
+    }
+
+    @Test
+    void pollTask_pushesWhenIntervalElapsed() {
+        asupManager.lastPushTime = Instant.EPOCH; // never pushed
+        when(storagePoolDao.findPoolsByProvider(OntapStorageConstants.ONTAP_PLUGIN_NAME))
+                .thenReturn(Collections.emptyList());
+        OntapAsupManager.OntapAsupPollTask task = asupManager.new OntapAsupPollTask();
+        task.run();
+        verify(storagePoolDao).findPoolsByProvider(OntapStorageConstants.ONTAP_PLUGIN_NAME);
+    }
+
     // ──────────────────────────────────────────────────────────────────────────
     // Utility helpers
     // ──────────────────────────────────────────────────────────────────────────