Fix dynamic changing of the scheduled task interval

Author: abh1sar

framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKeyScheduledExecutionWrapper.java

@@ -66,7 +66,7 @@ public ConfigKeyScheduledExecutionWrapper(ScheduledExecutorService executorServi
         this.unit = unit;
     }
 
-    protected ConfigKeyScheduledExecutionWrapper(ScheduledExecutorService executorService, Runnable command,
+    public ConfigKeyScheduledExecutionWrapper(ScheduledExecutorService executorService, Runnable command,
             ConfigKey<?> configKey, int enableIntervalSeconds, TimeUnit unit) {
         validateArgs(executorService, command, configKey);
         this.executorService = executorService;

server/src/main/java/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java

@@ -21,8 +21,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
@@ -48,7 +49,10 @@
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.framework.config.ConfigKey;
-import org.apache.cloudstack.managed.context.ManagedContextTimerTask;
+import org.apache.cloudstack.framework.config.ConfigKeyScheduledExecutionWrapper;
+import org.apache.cloudstack.managed.context.ManagedContextRunnable;
+
+import com.cloud.utils.concurrency.NamedThreadFactory;
 
 import com.cloud.alert.AlertManager;
 import com.cloud.configuration.Config;
@@ -179,15 +183,15 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn
 
     int _connLimit;
     int _subnetsLimit;
-    private Timer _vpnCheckTimer;
+    private ScheduledExecutorService _vpnCheckExecutor;
 
     @Override
     public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
         Map<String, String> configs = _configDao.getConfiguration(params);
         _connLimit = NumbersUtil.parseInt(configs.get(Config.Site2SiteVpnConnectionPerVpnGatewayLimit.key()), 4);
         _subnetsLimit = NumbersUtil.parseInt(configs.get(Config.Site2SiteVpnSubnetsPerCustomerGatewayLimit.key()), 10);
         assert (_s2sProviders.iterator().hasNext()) : "Did not get injected with a list of S2S providers!";
-        _vpnCheckTimer = new Timer("VpnCustomerGateway-ObsoleteCheck", true);
+        _vpnCheckExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("VpnCustomerGateway-ExcludedAndObsoleteCheck"));
         return true;
     }
 
@@ -1152,21 +1156,20 @@ public Site2SiteVpnGateway updateVpnGateway(Long id, String customId, Boolean fo
 
     @Override
     public boolean start() {
-        final long checkInterval = VpnCustomerGatewayObsoleteCheckInterval.value();
-        if (checkInterval > 0) {
-            TimerTask task = new CheckVpnCustomerGatewayObsoleteParametersTask();
-            _vpnCheckTimer.schedule(task, checkInterval * 60 * 60 * 1000L, checkInterval * 60 * 60 * 1000L);
-            logger.info("Scheduled VPN customer gateway obsolete parameters check with interval: " + checkInterval + " hours");
-        } else {
-            logger.debug("VPN customer gateway obsolete check is disabled (interval = 0)");
-        }
+        ConfigKeyScheduledExecutionWrapper runner = new ConfigKeyScheduledExecutionWrapper(
+            _vpnCheckExecutor,
+            new CheckVpnCustomerGatewayObsoleteParametersTask(),
+            VpnCustomerGatewayObsoleteCheckInterval,
+            60,
+            TimeUnit.MINUTES);
+        runner.start();
         return true;
     }
 
     @Override
     public boolean stop() {
-        if (_vpnCheckTimer != null) {
-            _vpnCheckTimer.cancel();
+        if (_vpnCheckExecutor != null) {
+            _vpnCheckExecutor.shutdownNow();
         }
         return true;
     }
@@ -1184,7 +1187,7 @@ public ConfigKey<?>[] getConfigKeys() {
                 VpnCustomerGatewayObsoleteCheckInterval};
     }
 
-    protected class CheckVpnCustomerGatewayObsoleteParametersTask extends ManagedContextTimerTask {
+    protected class CheckVpnCustomerGatewayObsoleteParametersTask extends ManagedContextRunnable {
 
         @Override
         protected void runInContext() {
@@ -1203,7 +1206,7 @@ protected void runInContext() {
                 }
                 if (CollectionUtils.isNotEmpty(obsoleteParameters)) {
                     obsoleteCount++;
-                    message.add("obsolete parameter(s) " + excludedParameters.toString());
+                    message.add("obsolete parameter(s) " + obsoleteParameters.toString());
                 }
 
                 if (CollectionUtils.isNotEmpty(message)) {

ui/public/locales/en.json

@@ -4057,7 +4057,7 @@
 "message.volumes.managed": "Volumes controlled by CloudStack.",
 "message.volumes.unmanaged": "Volumes not controlled by CloudStack.",
 "message.vpc.restart.required": "Restart is required for VPC(s). Click here to view VPC(s) which require restart.",
-"message.vpn.customer.gateway.contains.obsolete.parameters": "The VPN Customer Gateway is configured with parameters marked as obsolete. Consider changing the parameters using Update VPN Customer Gateway.",
+"message.vpn.customer.gateway.contains.excluded.obsolete.parameters": "This VPN Customer Gateway contains cryptographic parameters that are marked as excluded or obsolete by the Administrator. Consider changing them using the Update VPN Customer Gateway form.",
 "message.vpn.customer.gateway.excluded.parameter": " is marked as excluded. Please choose another value.",
 "message.vpn.customer.gateway.obsolete.parameter": " is marked as obsolete/insecure. Please choose another value.",
 "message.vpn.customer.gateway.obsolete.parameter.tooltip": "This parameter value is marked as obsolete/insecure.",

ui/src/components/view/ListView.vue

@@ -180,7 +180,9 @@
             </span>
             <span v-else-if="$route.path.startsWith('/vpncustomergateway')">
               &nbsp;
-              <a-tooltip v-if="record.excludedparameters || record.obsoleteparameters" :title="$t('message.vpn.customer.gateway.contains.obsolete.parameters')">
+              <a-tooltip
+                v-if="record.excludedparameters || record.obsoleteparameters"
+                :title="$t('message.vpn.customer.gateway.contains.excluded.obsolete.parameters')">
                 <warning-outlined :style="{ color: $config.theme['@warning-color'] }" />
               </a-tooltip>
             </span>