bulltrackers-module 1.0.770 → 1.0.772

package/functions/computation-system-v2/handlers/scheduler.js

@@ -168,46 +168,67 @@ async function runWatchdog(req, res) {
         return res.status(500).json({ error: error.message });
     }
 }
-
 // =============================================================================
 // ACTIVE GARBAGE COLLECTION LOGIC
 // =============================================================================
 
 async function cleanupOrphanedTasks() {
     const parent = getQueuePath();
-    const validKebabNames = new Set(manifest.map(m => toKebab(m.originalName)));
+    
+    // Create a map of { kebabName: activeHash } for O(1) lookups
+    const activeComputations = new Map(
+        manifest.map(m => [toKebab(m.originalName), m.hash])
+    );
+
     const limit = pLimit(CLOUD_TASKS_CONCURRENCY);
     let deletedCount = 0;
 
     try {
-        // Iterate over ALL tasks in the queue
-        // Note: listTasksAsync handles pagination automatically
         const tasksToDelete = [];
 
-        for await (const task of tasksClient.listTasksAsync({ parent, responseView: 'BASIC' })) {
+        // Note: listTasksAsync handles pagination, but if you have thousands of tasks,
+        // you might eventually need to handle page tokens explicitly if the library version is old.
+        for await (const task of tasksClient.listTasksAsync({ 
+            parent, 
+            responseView: 'BASIC',
+            pageSize: 1000 // Increase page size to capture more per request
+        })){
             const taskNameFull = task.name;
-            const taskNameShort = taskNameFull.split('/').pop(); // e.g., root-my-comp-2023-01-01-abcdef
+            const taskNameShort = taskNameFull.split('/').pop(); 
 
-            // 1. Regex Match: Capture the computation name part
-            // Pattern: (root|recovery)-{kebabName}-{date}-{hash}
-            // Date is YYYY-MM-DD (10 chars)
-            // Hash is 8 chars (or more)
-            const match = taskNameShort.match(/^(?:root|recovery)-(.+)-\d{4}-\d{2}-\d{2}-/);
+            // 1. Handle ROOT Tasks: root-{kebabName}-{date}-{hash}
+            // We capture the name AND the hash at the end
+            const rootMatch = taskNameShort.match(/^root-(.+)-\d{4}-\d{2}-\d{2}-(.+)$/);
 
-            if (!match) continue; // Skip tasks that don't match our naming convention
+            if (rootMatch) {
+                const [_, kebabName, taskHash] = rootMatch;
+                const activeHash = activeComputations.get(kebabName);
 
-            const extractedKebabName = match[1];
+                // DELETE IF:
+                // A) Computation removed from manifest (!activeHash)
+                // B) Hash mismatch (Old deployment/Stale) (activeHash !== taskHash)
+                if (!activeHash || activeHash !== taskHash) {
+                    tasksToDelete.push(taskNameFull);
+                }
+                continue;
+            }
 
-            // 2. Check Validity
-            if (!validKebabNames.has(extractedKebabName)) {
-                // ORPHAN DETECTED!
-                tasksToDelete.push(taskNameFull);
+            // 2. Handle RECOVERY Tasks: recovery-{kebabName}-{date}-{timestamp}
+            // We only delete these if the computation is completely gone.
+            // (Timestamps won't match a config hash, so we just check existence)
+            const recoveryMatch = taskNameShort.match(/^recovery-(.+)-\d{4}-\d{2}-\d{2}-/);
+            
+            if (recoveryMatch) {
+                const [_, kebabName] = recoveryMatch;
+                if (!activeComputations.has(kebabName)) {
+                    tasksToDelete.push(taskNameFull);
+                }
             }
         }
 
         if (tasksToDelete.length === 0) return 0;
 
-        console.log(`[Planner] 🗑️ Found ${tasksToDelete.length} orphaned tasks. Deleting...`);
+        console.log(`[Planner] 🗑️ Found ${tasksToDelete.length} stale/orphaned tasks. Deleting...`);
 
         // 3. Delete in parallel
         await Promise.all(tasksToDelete.map(name => limit(async () => {
@@ -215,7 +236,10 @@ async function cleanupOrphanedTasks() {
                 await tasksClient.deleteTask({ name });
                 deletedCount++;
             } catch (e) {
-                console.warn(`[Planner] Failed to delete orphan ${name}: ${e.message}`);
+                // Ignore "NOT_FOUND" errors in case of race conditions
+                if (e.code !== 5) { 
+                    console.warn(`[Planner] Failed to delete ${name}: ${e.message}`);
+                }
             }
         })));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bulltrackers-module",
-  "version": "1.0.770",
+  "version": "1.0.772",
   "description": "Helper Functions for Bulltrackers.",
   "main": "index.js",
   "files": [