From d8cc063e9775688a1631eda9203411a2dba0333c Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Wed, 11 Jan 2017 18:06:51 +0100
Subject: [PATCH] Server: do not break remote videos processing on error

---
 server/controllers/api/remote/videos.js | 33 ++++++++++++++++++-------
 server/models/request.js                |  4 +--
 server/tests/real-world/real-world.js   |  2 +-
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/server/controllers/api/remote/videos.js b/server/controllers/api/remote/videos.js
index 17bdce019..b9494f602 100644
--- a/server/controllers/api/remote/videos.js
+++ b/server/controllers/api/remote/videos.js
@@ -73,10 +73,10 @@ function addRemoteVideoRetryWrapper (videoToCreateData, fromPod, finalCallback)
     function (err) {
       if (err) {
         logger.error('Cannot insert the remote video with many retries.', { error: err })
-        return finalCallback(err)
       }
 
-      return finalCallback()
+      // Do not return the error, continue the process
+      return finalCallback(null)
     }
   )
 }
@@ -174,7 +174,7 @@ function addRemoteVideo (videoToCreateData, fromPod, finalCallback) {
     t.commit().asCallback(function (err) {
       if (err) return finalCallback(err)
 
-      logger.info('Remote video %s inserted.', videoToCreateData.videoToCreateData.name)
+      logger.info('Remote video %s inserted.', videoToCreateData.name)
       return finalCallback(null)
     })
   })
@@ -189,10 +189,10 @@ function updateRemoteVideoRetryWrapper (videoAttributesToUpdate, fromPod, finalC
     function (err) {
       if (err) {
         logger.error('Cannot update the remote video with many retries.', { error: err })
-        return finalCallback(err)
       }
 
-      return finalCallback()
+      // Do not return the error, continue the process
+      return finalCallback(null)
     }
   )
 }
@@ -270,10 +270,18 @@ function updateRemoteVideo (videoAttributesToUpdate, fromPod, finalCallback) {
 function removeRemoteVideo (videoToRemoveData, fromPod, callback) {
   // We need the instance because we have to remove some other stuffs (thumbnail etc)
   fetchVideo(fromPod.host, videoToRemoveData.remoteId, function (err, video) {
-    if (err) return callback(err)
+    // Do not return the error, continue the process
+    if (err) return callback(null)
 
     logger.debug('Removing remote video %s.', video.remoteId)
-    video.destroy().asCallback(callback)
+    video.destroy().asCallback(function (err) {
+      // Do not return the error, continue the process
+      if (err) {
+        logger.error('Cannot remove remote video with id %s.', videoToRemoveData.remoteId, { error: err })
+      }
+
+      return callback(null)
+    })
   })
 }
 
@@ -283,7 +291,8 @@ function reportAbuseRemoteVideo (reportData, fromPod, callback) {
       if (!err) err = new Error('video not found')
 
       logger.error('Cannot load video from id.', { error: err, id: reportData.videoRemoteId })
-      return callback(err)
+      // Do not return the error, continue the process
+      return callback(null)
     }
 
     logger.debug('Reporting remote abuse for video %s.', video.id)
@@ -295,7 +304,13 @@ function reportAbuseRemoteVideo (reportData, fromPod, callback) {
       videoId: video.id
     }
 
-    db.VideoAbuse.create(videoAbuseData).asCallback(callback)
+    db.VideoAbuse.create(videoAbuseData).asCallback(function (err) {
+      if (err) {
+        logger.error('Cannot create remote abuse video.', { error: err })
+      }
+
+      return callback(null)
+    })
   })
 }
 
diff --git a/server/models/request.js b/server/models/request.js
index 26953e5f5..e048c288b 100644
--- a/server/models/request.js
+++ b/server/models/request.js
@@ -152,8 +152,6 @@ function makeRequests () {
       return
     }
 
-    logger.info('Making requests to friends.')
-
     // We want to group requests by destinations pod and endpoint
     const requestsToMakeGrouped = {}
     Object.keys(requests).forEach(function (toPodId) {
@@ -176,6 +174,8 @@ function makeRequests () {
       })
     })
 
+    logger.info('Making requests to friends.', { requests: requestsToMakeGrouped })
+
     const goodPods = []
     const badPods = []
 
diff --git a/server/tests/real-world/real-world.js b/server/tests/real-world/real-world.js
index 751d3923f..9a63860ad 100644
--- a/server/tests/real-world/real-world.js
+++ b/server/tests/real-world/real-world.js
@@ -36,7 +36,7 @@ const numberOfPods = 6
 // Wait requests between pods
 const baseRequestInterval = integrityInterval < constants.REQUESTS_INTERVAL ? integrityInterval : constants.REQUESTS_INTERVAL
 const requestsMaxPerInterval = baseRequestInterval / actionInterval
-const intervalsToMakeAllRequests = Math.ceil(requestsMaxPerInterval / constants.REQUESTS_LIMIT)
+const intervalsToMakeAllRequests = Math.ceil(requestsMaxPerInterval / (constants.REQUESTS_LIMIT_PER_POD * numberOfPods))
 const waitForBeforeIntegrityCheck = (intervalsToMakeAllRequests * constants.REQUESTS_INTERVAL) + 1000
 
 console.log('Create weight: %d, remove weight: %d.', createWeight, removeWeight)
-- 
2.25.1