cleanup proccessed files in VR

Author: DaanHoogland

core/src/main/java/com/cloud/agent/api/CleanProcessCommandCacheAnswer.java

@@ -0,0 +1,34 @@
+package com.cloud.agent.api;
+
+import com.cloud.exception.CloudException;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class CleanProcessCommandCacheAnswer extends Answer {
+    int numberOfFiles = 0;
+    List<String> fileNames;
+
+    public CleanProcessCommandCacheAnswer(CleanProcessedCacheCommand cmd, String details) {
+        super(cmd, new CloudException(details));
+    }
+
+    public CleanProcessCommandCacheAnswer(CleanProcessedCacheCommand cmd, String details, boolean b) {
+        super(cmd, true, details);
+        String[] lines = details.split("\n");
+        for (String line: lines) {
+            parse(line);
+        }
+    }
+
+    void parse(String line) {
+        if (line.startsWith("numberOfFiles:")) {
+            String[] s = line.split(" ");
+            numberOfFiles = Integer.parseInt(s[1]);
+        } else if (line.startsWith("files:")) {
+            String[] s = line.split(" ") ;
+            fileNames = Arrays.stream(s, 1, s.length).collect(Collectors.toList());
+        }
+    }
+}

core/src/main/java/com/cloud/agent/api/CleanProcessedCacheCommand.java

@@ -0,0 +1,41 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.agent.api;
+
+import com.cloud.agent.api.routing.NetworkElementCommand;
+
+public class CleanProcessedCacheCommand extends NetworkElementCommand {
+    int days = 60;
+    protected CleanProcessedCacheCommand () {
+    }
+
+    public CleanProcessedCacheCommand (int days) {
+        this.days = days;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return false;
+    }
+
+    public int getDays() {
+        return this.days;
+    }
+}

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

@@ -42,6 +42,7 @@ public class VRScripts {
     public static final String IP_ALIAS_CONFIG = "ip_aliases.json";
     public static final String LOAD_BALANCER_CONFIG = "load_balancer.json";
 
+    public static final String CLEANUP_PROCESSED = "cleanup_processed.sh";
     public static final String SYSTEM_VM_PATCHED = "patched.sh";
     public final static String CONFIG_CACHE_LOCATION = "/var/cache/cloud/";
     public final static Duration VR_SCRIPT_EXEC_TIMEOUT = Duration.standardMinutes(10);

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

@@ -34,6 +34,8 @@
 
 import javax.naming.ConfigurationException;
 
+import com.cloud.agent.api.CleanProcessCommandCacheAnswer;
+import com.cloud.agent.api.CleanProcessedCacheCommand;
 import com.cloud.agent.api.routing.UpdateNetworkCommand;
 import com.cloud.agent.api.to.IpAddressTO;
 import com.cloud.network.router.VirtualRouter;
@@ -445,6 +447,15 @@ private Answer execute(CheckRouterCommand cmd) {
         return new CheckRouterAnswer(cmd, result.getDetails(), true);
     }
 
+    private Answer execute(CleanProcessedCacheCommand cmd) {
+        int days = cmd.getDays();
+        final ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.CLEANUP_PROCESSED, Integer.toString(days));
+        if (!result.isSuccess()) {
+            return new CleanProcessCommandCacheAnswer(cmd, result.getDetails());
+        }
+        return new CleanProcessCommandCacheAnswer(cmd, result.getDetails(), true);
+    }
+
     private Answer execute(DiagnosticsCommand cmd) {
         _eachTimeout = Duration.standardSeconds(NumbersUtil.parseInt("60", 60));
         final ExecutionResult result = _vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.DIAGNOSTICS, cmd.getSrciptArguments(), _eachTimeout);

systemvm/debian/opt/cloud/bin/cleanup_processed.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+days=60
+dir=/var/cache/cloud/processed
+
+if ! [ $# -eq 0 ]; then
+  re='^[0-9]+$'
+  if ! [[ $1 =~ $re ]] ; then
+    echo "error: argument must be a number and will be interpreted as a period in days" >&2; exit 1
+  else
+    days=$1
+  fi
+  if ! [ -z $2 ]; then
+    dir=$2
+  fi
+fi
+
+files_to_delete=`find . -mtime +${days} 2>/dev/null`
+
+if [ -z $files_to_delete ]
+then
+  echo "numberOfFiles: 0"
+  exit 0
+fi
+errors=`rm $files_to_delete >/dev/null`
+
+if [ $? ]
+then
+  echo -n "numberOfFiles: "
+  echo $files_to_delete | wc -w
+  echo "files: " $files_to_delete
+else
+  echo "ERRORS: " $errors
+fi