set cron fro cleanup on starting monitorring service

Author: DaanHoogland

api/src/main/java/com/cloud/network/element/NetworkElement.java

@@ -117,7 +117,7 @@ boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, Reser
     /**
      * The network service provider is being shutdown. This should shutdown all instances of this element deployed for this provider.
      * @param context
-     * @param networkServiceProvider
+     * @param provider
      * @return boolean success/failure
      * @throws ConcurrentOperationException
      * @throws ResourceUnavailableException

core/src/main/java/com/cloud/agent/api/routing/SetMonitorServiceCommand.java

@@ -34,6 +34,7 @@
 public class SetMonitorServiceCommand extends NetworkElementCommand {
     public static final String ROUTER_MONITORING_ENABLED = "router.monitor.enabled";
     public static final String ROUTER_HEALTH_CHECKS_ENABLED = "router.health.checks.enabled";
+    public static final String ROUTER_PROCESSED_COMMANDS_CLEANUP_INTERVAL = "router.processed.commands.cleanup.interval";
     public static final String ROUTER_HEALTH_CHECKS_BASIC_INTERVAL = "router.health.checks.basic.interval";
     public static final String ROUTER_HEALTH_CHECKS_ADVANCED_INTERVAL = "router.health.checks.advanced.interval";
     public static final String ROUTER_HEALTH_CHECKS_EXCLUDED = "router.health.checks.excluded";

core/src/main/java/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java

@@ -144,6 +144,9 @@ public Answer executeRequest(final NetworkElementCommand cmd) {
             if (cmd instanceof UpdateNetworkCommand) {
                 return execute((UpdateNetworkCommand) cmd);
             }
+            if (cmd instanceof CleanProcessedCacheCommand) {
+                return execute((CleanProcessedCacheCommand) cmd);
+            }
 
             if (_vrAggregateCommandsSet.containsKey(routerName)) {
                 _vrAggregateCommandsSet.get(routerName).add(cmd);

core/src/main/java/com/cloud/agent/resource/virtualnetwork/model/MonitorService.java

@@ -37,7 +37,6 @@ public MonitorService(String config, String disableMonitoring, String healthChec
         super(ConfigBase.MONITORSERVICE);
         this.config = config;
         this.disableMonitoring = disableMonitoring;
-        this.healthChecksEnabled = Boolean.parseBoolean(healthChecksEnabled);
     }
 
     public String getConfig() {

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

@@ -241,7 +241,7 @@ protected void runInContext() {
                 if (s_logger.isDebugEnabled()) {
                     s_logger.debug(log(seq, "Executing request"));
                 }
-                ArrayList<Answer> answers = new ArrayList<Answer>(cmds.length);
+                ArrayList<Answer> answers = new ArrayList<>(cmds.length);
                 for (int i = 0; i < cmds.length; i++) {
                     Answer answer = null;
                     Command currentCmd = cmds[i];

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java

@@ -1402,30 +1402,31 @@ private boolean networkMeetsPersistenceCriteria(NetworkVO network, NetworkOfferi
     @DB
     public Pair<NetworkGuru, NetworkVO> implementNetwork(final long networkId, final DeployDestination dest, final ReservationContext context) throws ConcurrentOperationException,
             ResourceUnavailableException, InsufficientCapacityException {
-        final Pair<NetworkGuru, NetworkVO> implemented = new Pair<NetworkGuru, NetworkVO>(null, null);
+        final Pair<NetworkGuru, NetworkVO> implemented = new Pair<>(null, null);
 
         NetworkVO network = _networksDao.findById(networkId);
         final NetworkGuru guru = AdapterBase.getAdapterByName(networkGurus, network.getGuruName());
         if (isNetworkImplemented(network)) {
             s_logger.debug("Network id=" + networkId + " is already implemented");
             implemented.set(guru, network);
             return implemented;
-        }
-
-        // Acquire lock only when network needs to be implemented
-        network = _networksDao.acquireInLockTable(networkId, NetworkLockTimeout.value());
-        if (network == null) {
-            // see NetworkVO.java
-            final ConcurrentOperationException ex = new ConcurrentOperationException("Unable to acquire network configuration");
-            ex.addProxyObject(_entityMgr.findById(Network.class, networkId).getUuid());
-            throw ex;
+        } else {
+            // Acquire lock only when network needs to be implemented
+            network = _networksDao.acquireInLockTable(networkId, NetworkLockTimeout.value());
+            if (network == null) {
+                // see NetworkVO.java
+                final ConcurrentOperationException ex = new ConcurrentOperationException("Unable to acquire network configuration");
+                ex.addProxyObject(_entityMgr.findById(Network.class, networkId).getUuid());
+                throw ex;
+            }
         }
 
         if (s_logger.isDebugEnabled()) {
             s_logger.debug("Lock is acquired for network id " + networkId + " as a part of network implement");
         }
 
         try {
+            // fixme: why is this repetition of block 20 lines back needed
             if (isNetworkImplemented(network)) {
                 s_logger.debug("Network id=" + networkId + " is already implemented");
                 implemented.set(guru, network);
@@ -1472,10 +1473,10 @@ public Pair<NetworkGuru, NetworkVO> implementNetwork(final long networkId, final
             return implemented;
         } catch (final NoTransitionException e) {
             s_logger.error(e.getMessage());
-            return new Pair<NetworkGuru, NetworkVO>(null, null);
+            return new Pair<>(null, null);
         } catch (final CloudRuntimeException | OperationTimedoutException e) {
             s_logger.error("Caught exception: " + e.getMessage());
-            return new Pair<NetworkGuru, NetworkVO>(null, null);
+            return new Pair<>(null, null);
         } finally {
             if (implemented.first() == null) {
                 s_logger.debug("Cleaning up because we're unable to implement the network " + network);
@@ -4416,12 +4417,12 @@ private void setStateMachine() {
     }
 
     private Map<Service, Set<Provider>> getServiceProvidersMap(final long networkId) {
-        final Map<Service, Set<Provider>> map = new HashMap<Service, Set<Provider>>();
+        final Map<Service, Set<Provider>> map = new HashMap<>();
         final List<NetworkServiceMapVO> nsms = _ntwkSrvcDao.getServicesInNetwork(networkId);
         for (final NetworkServiceMapVO nsm : nsms) {
             Set<Provider> providers = map.get(Service.getService(nsm.getService()));
             if (providers == null) {
-                providers = new HashSet<Provider>();
+                providers = new HashSet<>();
             }
             providers.add(Provider.getProvider(nsm.getProvider()));
             map.put(Service.getService(nsm.getService()), providers);
@@ -4433,14 +4434,14 @@ private Map<Service, Set<Provider>> getServiceProvidersMap(final long networkId)
     public List<Provider> getProvidersForServiceInNetwork(final Network network, final Service service) {
         final Map<Service, Set<Provider>> service2ProviderMap = getServiceProvidersMap(network.getId());
         if (service2ProviderMap.get(service) != null) {
-            final List<Provider> providers = new ArrayList<Provider>(service2ProviderMap.get(service));
+            final List<Provider> providers = new ArrayList<>(service2ProviderMap.get(service));
             return providers;
         }
         return null;
     }
 
     protected List<NetworkElement> getElementForServiceInNetwork(final Network network, final Service service) {
-        final List<NetworkElement> elements = new ArrayList<NetworkElement>();
+        final List<NetworkElement> elements = new ArrayList<>();
         final List<Provider> providers = getProvidersForServiceInNetwork(network, service);
         //Only support one provider now
         if (providers == null) {