bulltrackers-module 1.0.744 → 1.0.746

package/functions/computation-system-v2/framework/storage/StorageManager.js

@@ -43,6 +43,35 @@ class StorageManager {
         }
         return this._firestore;
     }
+
+    /**
+     * Updates the heartbeat of a zombie to "hide" it from detection 
+     * while the recovery task is being queued.
+     */
+    async claimZombie(checkpointId) {
+        if (!checkpointId) return;
+        
+        // FIX: Access projectId and dataset from the config object
+        const { projectId, dataset } = this.config.bigquery; //
+
+        const query = `
+            UPDATE \`${projectId}.${dataset}.computation_checkpoints\`
+            SET last_updated = CURRENT_TIMESTAMP()
+            WHERE checkpoint_id = @checkpointId
+        `;
+        
+        try {
+            await this.bigquery.query({
+                query,
+                params: { checkpointId }
+            });
+        } catch (e) {
+            // Ignore errors here, it's an optimization, not critical
+            console.warn(`[Storage] Failed to claim zombie ${checkpointId}: ${e.message}`);
+        }
+    }
+
+    
     
     // =========================================================================
     // RESULT COMMITTING (Batch -> GCS Buffer)
@@ -318,15 +347,40 @@ class StorageManager {
         const table = 'computation_checkpoints';
         const fullTable = `\`${this.config.bigquery.projectId}.${this.config.bigquery.dataset}.${table}\``;
         try {
+            // FIX: Use subquery with ROW_NUMBER to find the TRUE latest state per computation.
+            // We only count it as a zombie if the LATEST row is 'running'.
+            // This ignores 'running' rows that have a newer (or same-time) 'completed' sibling.
             const query = `
                 SELECT computation_name, date, checkpoint_id, last_updated
-                FROM ${fullTable}
-                WHERE status = 'running' AND last_updated < TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL @minutes MINUTE)
+                FROM (
+                    SELECT 
+                        computation_name, 
+                        date, 
+                        checkpoint_id, 
+                        last_updated, 
+                        status,
+                        ROW_NUMBER() OVER (
+                            PARTITION BY computation_name, date 
+                            ORDER BY last_updated DESC,
+                            CASE status 
+                                WHEN 'completed' THEN 1 
+                                WHEN 'failed' THEN 2 
+                                ELSE 3 
+                            END ASC
+                        ) as rn
+                    FROM ${fullTable}
+                )
+                WHERE rn = 1 
+                  AND status = 'running' 
+                  AND last_updated < TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL @minutes MINUTE)
                 LIMIT 50
             `;
             const [rows] = await this.bigquery.query({ query, params: { minutes: minutesThreshold }, location: this.config.bigquery.location });
             return rows.map(r => ({ name: r.computation_name, date: r.date.value || r.date, checkpointId: r.checkpoint_id }));
-        } catch (e) { return []; }
+        } catch (e) { 
+            console.error(`[Storage] findZombies failed: ${e.message}`);
+            return []; 
+        }
     }
 
     async completeCheckpoint(dateStr, computationName, checkpointId) {
@@ -344,11 +398,21 @@ class StorageManager {
         const table = 'computation_checkpoints';
         const fullTable = `\`${this.config.bigquery.projectId}.${this.config.bigquery.dataset}.${table}\``;
         try {
+            // FIX: Added Tie-Breaker logic to ORDER BY
+            // If timestamps are identical, 'completed' (1) comes before 'failed' (2) before 'running' (3).
+            // This ensures we never accidentally pick a "running" row when a "completed" one exists at the exact same ms.
             const query = `
                 SELECT checkpoint_id, status, processed_count, last_entity_id, completed_batches, worker_instance_id, last_updated, attempts, code_hash, started_at
                 FROM ${fullTable}
                 WHERE date = @date AND computation_name = @computationName
-                ORDER BY last_updated DESC LIMIT 1
+                ORDER BY 
+                    last_updated DESC,
+                    CASE status 
+                        WHEN 'completed' THEN 1 
+                        WHEN 'failed' THEN 2 
+                        ELSE 3 
+                    END ASC
+                LIMIT 1
             `;
             const [rows] = await this.bigquery.query({ query, params: { date: dateStr, computationName }, location: this.config.bigquery.location });
             if (rows.length === 0) return null;
@@ -696,6 +760,7 @@ class StorageManager {
         
         this._log('ERROR', `${context}: ${details}`);
     }
+    
 }
 
 module.exports = { StorageManager };

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

@@ -51,14 +51,21 @@ async function schedulerHandler(req, res) {
         const dueComputations = findDueComputations(now);
         
         // 2. ZOMBIE DETECTION
-        // Find tasks marked 'running' that haven't heartbeated in X mins
         let zombies = [];
         try {
             zombies = await storageManager.findZombies(ZOMBIE_THRESHOLD_MINUTES);
-            // New Code
+            
             if (zombies.length > 0) {
                 const zombieDetails = zombies.map(z => `${z.name} [${z.date}]`).join(', ');
                 console.log(`[Scheduler] DETECTED ${zombies.length} ZOMBIES: ${zombieDetails}`);
+
+                // --- NEW FIX: CLAIM ZOMBIES ---
+                // "Touch" these rows in the DB so they don't look like zombies for another 15 mins.
+                // This prevents re-dispatching the same task 15 times if the queue is slow.
+                await Promise.all(zombies.map(z => 
+                    storageManager.claimZombie(z.checkpointId) 
+                ));
+                // ------------------------------
             }
         } catch (e) {
             console.error(`[Scheduler] Zombie check failed: ${e.message}`);

package/package.json

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