Merge pull request #57 from pierotofy/vacuumoffline

Vacuum offline ASR nodes
OpenDroneMap · Jul 11, 2020 · ba612ab · ba612ab
2 parents 420895b + 8127b52
commit ba612ab
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/libs/asrProvider.js b/libs/asrProvider.js
@@ -113,24 +113,33 @@ module.exports = {
     },
 
     vacuum: async function(){
-        const autoNodes = nodes.filter(n => n.isAutoSpawned() && n.isOnline());
+        const autoNodes = nodes.filter(n => n.isAutoSpawned());
 
         // Automatically remove autospawned nodes if either:
         // - They have been online for too long (stuck?)
-        // - They have an empty queue and are past their allowed upload time
-
+        // - They are online and have an empty queue and are past their allowed upload time
+        // - They are offline and have been offline for too long (past the maximum allowed upload time)
         const now = new Date().getTime();
         const cleanNodes = [];
 
         autoNodes.forEach(n => {
-            if (n.getDockerMachineMaxRuntime() > 0 && (now - n.getDockerMachineCreated()) > n.getDockerMachineMaxRuntime() * 1000){
-                logger.warn(`${n} has exceeded its maximum runtime and will be forcibly deleted!`)
-                cleanNodes.push(n);
+            if (n.isOnline()){
+                if (n.getDockerMachineMaxRuntime() > 0 && (now - n.getDockerMachineCreated()) > n.getDockerMachineMaxRuntime() * 1000){
+                    logger.warn(`${n} has exceeded its maximum runtime and will be forcibly deleted!`)
+                    cleanNodes.push(n);
+                }else{
+                    if (n.getDockerMachineMaxUploadTime() > 0 &&
+                        n.getInfoProperty("taskQueueCount", 0) === 0 && 
+                        (now - n.getDockerMachineCreated()) > n.getDockerMachineMaxUploadTime() * 1000){
+                        logger.warn(`${n} has exceeded its maximum upload time and will be forcibly deleted!`)
+                        cleanNodes.push(n);
+                    }
+                }
             }else{
+                // Offline
                 if (n.getDockerMachineMaxUploadTime() > 0 &&
-                    n.getInfoProperty("taskQueueCount", 0) === 0 && 
-                    (now - n.getDockerMachineCreated()) > n.getDockerMachineMaxUploadTime() * 1000){
-                    logger.warn(`${n} has exceeded its maximum upload time and will be forcibly deleted!`)
+                    (now - n.getLastRefreshed()) > n.getDockerMachineMaxUploadTime() * 1000){
+                    logger.warn(`${n} has been offline for too long and will be forcibly deleted!`)
                     cleanNodes.push(n);
                 }
             }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ClusterODM",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "",
   "main": "index.js",
   "scripts": {