From e77cdd10c80ebce2fac36ed28acc3e76061e8d00 Mon Sep 17 00:00:00 2001
From: Zaid Abdulla <zkam83@gmail.com>
Date: Sun, 3 Nov 2013 00:54:22 +0300
Subject: [PATCH] Faulty tasks automatically retried later rather than hold the
 taks queue.

---
 acs.coffee    | 20 ++++++++------------
 api.coffee    |  2 +-
 config.coffee |  1 +
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/acs.coffee b/acs.coffee
index 0b48bb1..363616f 100644
--- a/acs.coffee
+++ b/acs.coffee
@@ -179,16 +179,15 @@ runTask = (currentRequest, task, methodResponse) ->
             )
           )
         when tasks.STATUS_FAULT
-          util.log("#{currentRequest.deviceId}: Fault response for task #{task._id}")
-          taskUpdate = {fault : task.fault}
+          retryAfter = config.RETRY_DELAY * Math.pow(2, task.retries ? 0)
+          util.log("#{currentRequest.deviceId}: Fault response for task #{task._id}. Retrying after #{retryAfter} seconds.")
+          taskUpdate = {fault : task.fault, timestamp : new Date(Date.now() + retryAfter * 1000)}
           if save
             taskUpdate.session = task.session
 
-          db.tasksCollection.update({_id : mongodb.ObjectID(String(task._id))}, {$set : taskUpdate}, (err) ->
+          db.tasksCollection.update({_id : mongodb.ObjectID(String(task._id))}, {$set : taskUpdate, $inc : {retries : 1}}, (err) ->
             throw err if err
-            # Faulty task. No more work to do until task is deleted.
-            res = tr069.response(null, cwmpResponse)
-            writeResponse(currentRequest, res)
+            nextTask(currentRequest)
           )
         else
           throw Error('Unknown task status')
@@ -256,18 +255,15 @@ assertPresets = (currentRequest) ->
 
 
 nextTask = (currentRequest) ->
-  cur = db.tasksCollection.find({'device' : currentRequest.deviceId}).sort(['timestamp']).limit(1)
+  now = new Date()
+  cur = db.tasksCollection.find({'device' : currentRequest.deviceId, timestamp : {$lte : now}}).sort(['timestamp']).limit(1)
   cur.nextObject((err, task) ->
-    throw new Error(err) if err?
+    throw err if err
     cwmpResponse = {}
 
     if not task
       # no more tasks, check presets discrepancy
       assertPresets(currentRequest)
-    else if task.fault?
-      # last task was faulty. Do nothing until until task is deleted
-      res = tr069.response(null, cwmpResponse)
-      writeResponse(currentRequest, res)
     else if isTaskExpired(task)
       util.log("#{currentRequest.deviceId}: Task is expired #{task.name}(#{task._id})")
       db.tasksCollection.remove({'_id' : mongodb.ObjectID(String(task._id))}, {safe: true}, (err, removed) ->
diff --git a/api.coffee b/api.coffee
index 857c08b..f22c080 100644
--- a/api.coffee
+++ b/api.coffee
@@ -239,7 +239,7 @@ else
             response.end('405 Method Not Allowed')
         else if action is '/retry'
           if request.method == 'POST'
-            db.tasksCollection.update({_id : taskId}, {$unset : {fault : 1}, $inc : {retries : 1}, '$set' : {timestamp : new Date()}}, (err, count) ->
+            db.tasksCollection.update({_id : taskId}, {$unset : {fault : 1}, $set : {timestamp : new Date()}}, (err, count) ->
               # TODO need to invalidate presets hash for the device
               response.writeHead(200)
               response.end()
diff --git a/config.coffee b/config.coffee
index f181f76..7453472 100644
--- a/config.coffee
+++ b/config.coffee
@@ -18,6 +18,7 @@ exports.WORKER_RESPAWN_TIME = 60000
 exports.LOG_INFORMS = false
 exports.DEBUG_DEVICES = {} # {'202BC1-BM632w-8KA8WA1151100043' : true}
 exports.DEVICE_ONLINE_THRESHOLD = 4000
+exports.RETRY_DELAY = 300
 
 exports.MONGODB_OPTIONS = {
   db : {