X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Frequest.js;h=bae227c058aaa902ecdba0acc682a5f743bbb64a;hb=bdfbd4f162d66c3a6bd7c312a99e0b692e830792;hp=2d50d94e0c26805d2c2298c15b5a0d3132b0eedc;hpb=5abeec313f897bbb1f1f39c3849675ec9a77d506;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/request.js b/server/models/request.js index 2d50d94e0..bae227c05 100644 --- a/server/models/request.js +++ b/server/models/request.js @@ -2,58 +2,60 @@ const each = require('async/each') const eachLimit = require('async/eachLimit') -const map = require('lodash/map') -const mongoose = require('mongoose') const waterfall = require('async/waterfall') +const values = require('lodash/values') const constants = require('../initializers/constants') const logger = require('../helpers/logger') const requests = require('../helpers/requests') -const Pod = mongoose.model('Pod') -const Video = mongoose.model('Video') - let timer = null let lastRequestTimestamp = 0 // --------------------------------------------------------------------------- -const RequestSchema = mongoose.Schema({ - request: mongoose.Schema.Types.Mixed, - to: [ { type: mongoose.Schema.Types.ObjectId, ref: 'Pod' } ] -}) - -RequestSchema.statics = { - activate, - deactivate, - flush, - forceSend, - list, - remainingMilliSeconds -} - -RequestSchema.pre('save', function (next) { - const self = this - - if (self.to.length === 0) { - Pod.listAllIds(function (err, podIds) { - if (err) return next(err) - - // No friends - if (podIds.length === 0) return - - self.to = podIds - return next() - }) - } else { - return next() - } -}) +module.exports = function (sequelize, DataTypes) { + const Request = sequelize.define('Request', + { + request: { + type: DataTypes.JSON, + allowNull: false + }, + endpoint: { + type: DataTypes.ENUM(values(constants.REQUEST_ENDPOINTS)), + allowNull: false + } + }, + { + classMethods: { + associate, + + activate, + countTotalRequests, + deactivate, + flush, + forceSend, + remainingMilliSeconds + } + } + ) -mongoose.model('Request', RequestSchema) + return Request +} // ------------------------------ STATICS ------------------------------ +function associate (models) { + this.belongsToMany(models.Pod, { + foreignKey: { + name: 'requestId', + allowNull: false + }, + through: models.RequestToPod, + onDelete: 'CASCADE' + }) +} + function activate () { logger.info('Requests scheduler activated.') lastRequestTimestamp = Date.now() @@ -65,15 +67,25 @@ function activate () { }, constants.REQUESTS_INTERVAL) } +function countTotalRequests (callback) { + const query = { + include: [ this.sequelize.models.Pod ] + } + + return this.count(query).asCallback(callback) +} + function deactivate () { logger.info('Requests scheduler deactivated.') clearInterval(timer) timer = null } -function flush () { +function flush (callback) { removeAll.call(this, function (err) { if (err) logger.error('Cannot flush the requests.', { error: err }) + + return callback(err) }) } @@ -82,10 +94,6 @@ function forceSend () { makeRequests.call(this) } -function list (callback) { - this.find({ }, callback) -} - function remainingMilliSeconds () { if (timer === null) return -1 @@ -95,15 +103,14 @@ function remainingMilliSeconds () { // --------------------------------------------------------------------------- // Make a requests to friends of a certain type -function makeRequest (toPod, requestsToMake, callback) { +function makeRequest (toPod, requestEndpoint, requestsToMake, callback) { if (!callback) callback = function () {} const params = { toPod: toPod, - encrypt: true, // Security - sign: true, // To prove our identity + sign: true, // Prove our identity method: 'POST', - path: '/api/' + constants.API_VERSION + '/remote/videos', + path: '/api/' + constants.API_VERSION + '/remote/' + requestEndpoint, data: requestsToMake // Requests we need to make } @@ -113,9 +120,9 @@ function makeRequest (toPod, requestsToMake, callback) { if (err || (res.statusCode !== 200 && res.statusCode !== 201 && res.statusCode !== 204)) { logger.error( 'Error sending secure request to %s pod.', - toPod.url, + toPod.host, { - error: err || new Error('Status code not 20x : ' + res.statusCode) + error: err ? err.message : 'Status code not 20x : ' + res.statusCode } ) @@ -129,8 +136,11 @@ function makeRequest (toPod, requestsToMake, callback) { // Make all the requests of the scheduler function makeRequests () { const self = this + const RequestToPod = this.sequelize.models.RequestToPod - listWithLimit.call(self, constants.REQUESTS_LIMIT, function (err, requests) { + // We limit the size of the requests (REQUESTS_LIMIT) + // We don't want to stuck with the same failing requests so we get a random list + listWithLimitAndRandom.call(self, constants.REQUESTS_LIMIT, function (err, requests) { if (err) { logger.error('Cannot get the list of requests.', { err: err }) return // Abort @@ -144,31 +154,34 @@ function makeRequests () { logger.info('Making requests to friends.') - // Requests by pods id - const requestsToMake = {} - - requests.forEach(function (poolRequest) { - poolRequest.to.forEach(function (toPodId) { - if (!requestsToMake[toPodId]) { - requestsToMake[toPodId] = { - ids: [], - datas: [] + // We want to group requests by destinations pod and endpoint + const requestsToMakeGrouped = {} + + requests.forEach(function (request) { + request.Pods.forEach(function (toPod) { + const hashKey = toPod.id + request.endpoint + if (!requestsToMakeGrouped[hashKey]) { + requestsToMakeGrouped[hashKey] = { + toPodId: toPod.id, + endpoint: request.endpoint, + ids: [], // request ids, to delete them from the DB in the future + datas: [] // requests data, } } - requestsToMake[toPodId].ids.push(poolRequest._id) - requestsToMake[toPodId].datas.push(poolRequest.request) + requestsToMakeGrouped[hashKey].ids.push(request.id) + requestsToMakeGrouped[hashKey].datas.push(request.request) }) }) const goodPods = [] const badPods = [] - eachLimit(Object.keys(requestsToMake), constants.REQUESTS_IN_PARALLEL, function (toPodId, callbackEach) { - const requestToMake = requestsToMake[toPodId] + eachLimit(Object.keys(requestsToMakeGrouped), constants.REQUESTS_IN_PARALLEL, function (hashKey, callbackEach) { + const requestToMake = requestsToMakeGrouped[hashKey] - // FIXME: mongodb request inside a loop :/ - Pod.load(toPodId, function (err, toPod) { + // FIXME: SQL request inside a loop :/ + self.sequelize.models.Pod.load(requestToMake.toPodId, function (err, toPod) { if (err) { logger.error('Error finding pod by id.', { err: err }) return callbackEach() @@ -176,38 +189,45 @@ function makeRequests () { // Maybe the pod is not our friend anymore so simply remove it if (!toPod) { - removePodOf.call(self, requestToMake.ids, toPodId) + const requestIdsToDelete = requestToMake.ids + + logger.info('Removing %d requests of unexisting pod %s.', requestIdsToDelete.length, requestToMake.toPodId) + RequestToPod.removePodOf.call(self, requestIdsToDelete, requestToMake.toPodId) return callbackEach() } - makeRequest(toPod, requestToMake.datas, function (success) { + makeRequest(toPod, requestToMake.endpoint, requestToMake.datas, function (success) { if (success === true) { - logger.debug('Removing requests for %s pod.', toPodId, { requestsIds: requestToMake.ids }) + logger.debug('Removing requests for pod %s.', requestToMake.toPodId, { requestsIds: requestToMake.ids }) + + goodPods.push(requestToMake.toPodId) // Remove the pod id of these request ids - removePodOf.call(self, requestToMake.ids, toPodId) - goodPods.push(toPodId) + RequestToPod.removePodOf(requestToMake.ids, requestToMake.toPodId, callbackEach) } else { - badPods.push(toPodId) + badPods.push(requestToMake.toPodId) + callbackEach() } - - callbackEach() }) }) }, function () { // All the requests were made, we update the pods score - updatePodsScore(goodPods, badPods) + updatePodsScore.call(self, goodPods, badPods) // Flush requests with no pod - removeWithEmptyTo.call(self) + removeWithEmptyTo.call(self, function (err) { + if (err) logger.error('Error when removing requests with no pods.', { error: err }) + }) }) }) } // Remove pods with a score of 0 (too many requests where they were unreachable) function removeBadPods () { + const self = this + waterfall([ function findBadPods (callback) { - Pod.listBadPods(function (err, pods) { + self.sequelize.models.Pod.listBadPods(function (err, pods) { if (err) { logger.error('Cannot find bad pods.', { error: err }) return callback(err) @@ -217,54 +237,11 @@ function removeBadPods () { }) }, - function listVideosOfTheseBadPods (pods, callback) { - if (pods.length === 0) return callback(null) - - const urls = map(pods, 'url') - - Video.listByUrls(urls, function (err, videosList) { - if (err) { - logger.error('Cannot list videos urls.', { error: err, urls: urls }) - return callback(null, pods, []) - } - - return callback(null, pods, videosList) - }) - }, - - function removeVideosOfTheseBadPods (pods, videosList, callback) { - // We don't have to remove pods, skip - if (typeof pods === 'function') { - callback = pods - return callback(null) - } - - each(videosList, function (video, callbackEach) { - video.remove(callbackEach) - }, function (err) { - if (err) { - // Don't stop the process - logger.error('Error while removing videos of bad pods.', { error: err }) - return - } - - return callback(null, pods) - }) - }, - - function removeBadPodsFromDB (pods, callback) { - // We don't have to remove pods, skip - if (typeof pods === 'function') { - callback = pods - return callback(null) - } - + function removeTheseBadPods (pods, callback) { each(pods, function (pod, callbackEach) { - pod.remove(callbackEach) + pod.destroy().asCallback(callbackEach) }, function (err) { - if (err) return callback(err) - - return callback(null, pods.length) + return callback(err, pods.length) }) } ], function (err, numberOfPodsRemoved) { @@ -279,34 +256,67 @@ function removeBadPods () { } function updatePodsScore (goodPods, badPods) { + const self = this + const Pod = this.sequelize.models.Pod + logger.info('Updating %d good pods and %d bad pods scores.', goodPods.length, badPods.length) - Pod.incrementScores(goodPods, constants.PODS_SCORE.BONUS, function (err) { - if (err) logger.error('Cannot increment scores of good pods.') - }) + if (goodPods.length !== 0) { + Pod.incrementScores(goodPods, constants.PODS_SCORE.BONUS, function (err) { + if (err) logger.error('Cannot increment scores of good pods.', { error: err }) + }) + } - Pod.incrementScores(badPods, constants.PODS_SCORE.MALUS, function (err) { - if (err) logger.error('Cannot decrement scores of bad pods.') - removeBadPods() - }) + if (badPods.length !== 0) { + Pod.incrementScores(badPods, constants.PODS_SCORE.MALUS, function (err) { + if (err) logger.error('Cannot decrement scores of bad pods.', { error: err }) + removeBadPods.call(self) + }) + } } -function listWithLimit (limit, callback) { - this.find({ }, { _id: 1, request: 1, to: 1 }).sort({ _id: 1 }).limit(limit).exec(callback) -} +function listWithLimitAndRandom (limit, callback) { + const self = this -function removeAll (callback) { - this.remove({ }, callback) -} + self.count().asCallback(function (err, count) { + if (err) return callback(err) -function removePodOf (requestsIds, podId, callback) { - if (!callback) callback = function () {} + // Optimization... + if (count === 0) return callback(null, []) - this.update({ _id: { $in: requestsIds } }, { $pull: { to: podId } }, { multi: true }, callback) + let start = Math.floor(Math.random() * count) - limit + if (start < 0) start = 0 + + const query = { + order: [ + [ 'id', 'ASC' ] + ], + offset: start, + limit: limit, + include: [ this.sequelize.models.Pod ] + } + + self.findAll(query).asCallback(callback) + }) +} + +function removeAll (callback) { + // Delete all requests + this.truncate({ cascade: true }).asCallback(callback) } function removeWithEmptyTo (callback) { if (!callback) callback = function () {} - this.remove({ to: { $size: 0 } }, callback) + const query = { + where: { + id: { + $notIn: [ + this.sequelize.literal('SELECT "requestId" FROM "RequestToPods"') + ] + } + } + } + + this.destroy(query).asCallback(callback) }