X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fjob-queue%2Fjob-queue.ts;h=38b1d6f1ff6ed9d0a5c5056195660f1e18a75314;hb=77d7e851dccf17dcc89e8fcc2db3f655d1e63f95;hp=66cced59a6e76b0928926a8ed0fd35e356aebcc3;hpb=628d28e84ba49f4214cfe4946cbaf0a9f799929a;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/job-queue/job-queue.ts b/server/lib/job-queue/job-queue.ts index 66cced59a..38b1d6f1f 100644 --- a/server/lib/job-queue/job-queue.ts +++ b/server/lib/job-queue/job-queue.ts @@ -1,161 +1,238 @@ -import * as kue from 'kue' -import { JobState, JobType } from '../../../shared/models' +import * as Bull from 'bull' +import { jobStates } from '@server/helpers/custom-validators/jobs' +import { processVideoRedundancy } from '@server/lib/job-queue/handlers/video-redundancy' +import { + ActivitypubFollowPayload, + ActivitypubHttpBroadcastPayload, + ActivitypubHttpFetcherPayload, + ActivitypubHttpUnicastPayload, + EmailPayload, + JobState, + JobType, + RefreshPayload, + VideoFileImportPayload, + VideoImportPayload, + VideoLiveEndingPayload, + VideoRedundancyPayload, + VideoTranscodingPayload +} from '../../../shared/models' import { logger } from '../../helpers/logger' -import { CONFIG, JOB_ATTEMPTS, JOB_COMPLETED_LIFETIME, JOB_CONCURRENCY } from '../../initializers' +import { JOB_ATTEMPTS, JOB_COMPLETED_LIFETIME, JOB_CONCURRENCY, JOB_TTL, REPEAT_JOBS, WEBSERVER } from '../../initializers/constants' import { Redis } from '../redis' -import { ActivitypubHttpBroadcastPayload, processActivityPubHttpBroadcast } from './handlers/activitypub-http-broadcast' -import { ActivitypubHttpFetcherPayload, processActivityPubHttpFetcher } from './handlers/activitypub-http-fetcher' -import { ActivitypubHttpUnicastPayload, processActivityPubHttpUnicast } from './handlers/activitypub-http-unicast' -import { EmailPayload, processEmail } from './handlers/email' -import { processVideoFile, VideoFilePayload } from './handlers/video-file' +import { processActivityPubFollow } from './handlers/activitypub-follow' +import { processActivityPubHttpBroadcast } from './handlers/activitypub-http-broadcast' +import { processActivityPubHttpFetcher } from './handlers/activitypub-http-fetcher' +import { processActivityPubHttpUnicast } from './handlers/activitypub-http-unicast' +import { refreshAPObject } from './handlers/activitypub-refresher' +import { processEmail } from './handlers/email' +import { processVideoFileImport } from './handlers/video-file-import' +import { processVideoImport } from './handlers/video-import' +import { processVideoLiveEnding } from './handlers/video-live-ending' +import { processVideoTranscoding } from './handlers/video-transcoding' +import { processVideosViews } from './handlers/video-views' type CreateJobArgument = { type: 'activitypub-http-broadcast', payload: ActivitypubHttpBroadcastPayload } | { type: 'activitypub-http-unicast', payload: ActivitypubHttpUnicastPayload } | { type: 'activitypub-http-fetcher', payload: ActivitypubHttpFetcherPayload } | - { type: 'video-file', payload: VideoFilePayload } | - { type: 'email', payload: EmailPayload } + { type: 'activitypub-follow', payload: ActivitypubFollowPayload } | + { type: 'video-file-import', payload: VideoFileImportPayload } | + { type: 'video-transcoding', payload: VideoTranscodingPayload } | + { type: 'email', payload: EmailPayload } | + { type: 'video-import', payload: VideoImportPayload } | + { type: 'activitypub-refresher', payload: RefreshPayload } | + { type: 'videos-views', payload: {} } | + { type: 'video-live-ending', payload: VideoLiveEndingPayload } | + { type: 'video-redundancy', payload: VideoRedundancyPayload } + +type CreateJobOptions = { + delay?: number + priority?: number +} -const handlers: { [ id in JobType ]: (job: kue.Job) => Promise} = { +const handlers: { [id in JobType]: (job: Bull.Job) => Promise } = { 'activitypub-http-broadcast': processActivityPubHttpBroadcast, 'activitypub-http-unicast': processActivityPubHttpUnicast, 'activitypub-http-fetcher': processActivityPubHttpFetcher, - 'video-file': processVideoFile, - 'email': processEmail + 'activitypub-follow': processActivityPubFollow, + 'video-file-import': processVideoFileImport, + 'video-transcoding': processVideoTranscoding, + 'email': processEmail, + 'video-import': processVideoImport, + 'videos-views': processVideosViews, + 'activitypub-refresher': refreshAPObject, + 'video-live-ending': processVideoLiveEnding, + 'video-redundancy': processVideoRedundancy } +const jobTypes: JobType[] = [ + 'activitypub-follow', + 'activitypub-http-broadcast', + 'activitypub-http-fetcher', + 'activitypub-http-unicast', + 'email', + 'video-transcoding', + 'video-file-import', + 'video-import', + 'videos-views', + 'activitypub-refresher', + 'video-redundancy', + 'video-live-ending' +] + class JobQueue { private static instance: JobQueue - private jobQueue: kue.Queue + private queues: { [id in JobType]?: Bull.Queue } = {} private initialized = false private jobRedisPrefix: string - private constructor () {} + private constructor () { + } - async init () { + init () { // Already initialized if (this.initialized === true) return this.initialized = true - this.jobRedisPrefix = 'q-' + CONFIG.WEBSERVER.HOST - - this.jobQueue = kue.createQueue({ + this.jobRedisPrefix = 'bull-' + WEBSERVER.HOST + const queueOptions = { prefix: this.jobRedisPrefix, - redis: { - host: CONFIG.REDIS.HOSTNAME, - port: CONFIG.REDIS.PORT, - auth: CONFIG.REDIS.AUTH + redis: Redis.getRedisClientOptions(), + settings: { + maxStalledCount: 10 // transcoding could be long, so jobs can often be interrupted by restarts } - }) + } - this.jobQueue.setMaxListeners(15) + for (const handlerName of Object.keys(handlers)) { + const queue = new Bull(handlerName, queueOptions) + const handler = handlers[handlerName] - this.jobQueue.on('error', err => { - logger.error('Error in job queue.', err) - process.exit(-1) - }) - this.jobQueue.watchStuckJobs(5000) + queue.process(JOB_CONCURRENCY[handlerName], handler) + .catch(err => logger.error('Error in job queue processor %s.', handlerName, { err })) - await this.reactiveStuckJobs() + queue.on('failed', (job, err) => { + logger.error('Cannot execute job %d in queue %s.', job.id, handlerName, { payload: job.data, err }) + }) - for (const handlerName of Object.keys(handlers)) { - this.jobQueue.process(handlerName, JOB_CONCURRENCY[handlerName], async (job, done) => { - try { - const res = await handlers[ handlerName ](job) - return done(null, res) - } catch (err) { - return done(err) - } + queue.on('error', err => { + logger.error('Error in job queue %s.', handlerName, { err }) }) + + this.queues[handlerName] = queue } - } - createJob (obj: CreateJobArgument, priority = 'normal') { - return new Promise((res, rej) => { - this.jobQueue - .create(obj.type, obj.payload) - .priority(priority) - .attempts(JOB_ATTEMPTS[obj.type]) - .backoff({ delay: 60 * 1000, type: 'exponential' }) - .save(err => { - if (err) return rej(err) - - return res() - }) - }) + this.addRepeatableJobs() } - async listForApi (state: JobState, start: number, count: number, sort: 'ASC' | 'DESC'): Promise { - const jobStrings = await Redis.Instance.listJobs(this.jobRedisPrefix, state, 'alpha', sort, start, count) - - const jobPromises = jobStrings - .map(s => s.split('|')) - .map(([ , jobId ]) => this.getJob(parseInt(jobId, 10))) + terminate () { + for (const queueName of Object.keys(this.queues)) { + const queue = this.queues[queueName] + queue.close() + } + } - return Promise.all(jobPromises) + createJob (obj: CreateJobArgument, options: CreateJobOptions = {}): void { + this.createJobWithPromise(obj, options) + .catch(err => logger.error('Cannot create job.', { err, obj })) } - count (state: JobState) { - return new Promise((res, rej) => { - this.jobQueue[state + 'Count']((err, total) => { - if (err) return rej(err) + createJobWithPromise (obj: CreateJobArgument, options: CreateJobOptions = {}) { + const queue = this.queues[obj.type] + if (queue === undefined) { + logger.error('Unknown queue %s: cannot create job.', obj.type) + return + } - return res(total) - }) - }) + const jobArgs: Bull.JobOptions = { + backoff: { delay: 60 * 1000, type: 'exponential' }, + attempts: JOB_ATTEMPTS[obj.type], + timeout: JOB_TTL[obj.type], + priority: options.priority, + delay: options.delay + } + + return queue.add(obj.payload, jobArgs) } - removeOldJobs () { - const now = new Date().getTime() - kue.Job.rangeByState('complete', 0, -1, 'asc', (err, jobs) => { - if (err) { - logger.error('Cannot get jobs when removing old jobs.', err) - return + async listForApi (options: { + state?: JobState + start: number + count: number + asc?: boolean + jobType: JobType + }): Promise { + const { state, start, count, asc, jobType } = options + + const states = state ? [ state ] : jobStates + let results: Bull.Job[] = [] + + const filteredJobTypes = this.filterJobTypes(jobType) + + for (const jobType of filteredJobTypes) { + const queue = this.queues[jobType] + if (queue === undefined) { + logger.error('Unknown queue %s to list jobs.', jobType) + continue } - for (const job of jobs) { - if (now - job.created_at > JOB_COMPLETED_LIFETIME) { - job.remove() - } - } + const jobs = await queue.getJobs(states, 0, start + count, asc) + results = results.concat(jobs) + } + + results.sort((j1: any, j2: any) => { + if (j1.timestamp < j2.timestamp) return -1 + else if (j1.timestamp === j2.timestamp) return 0 + + return 1 }) + + if (asc === false) results.reverse() + + return results.slice(start, start + count) } - private reactiveStuckJobs () { - const promises: Promise[] = [] + async count (state: JobState, jobType?: JobType): Promise { + const states = state ? [ state ] : jobStates + let total = 0 - this.jobQueue.active((err, ids) => { - if (err) throw err + const filteredJobTypes = this.filterJobTypes(jobType) - for (const id of ids) { - kue.Job.get(id, (err, job) => { - if (err) throw err + for (const type of filteredJobTypes) { + const queue = this.queues[type] + if (queue === undefined) { + logger.error('Unknown queue %s to count jobs.', type) + continue + } - const p = new Promise((res, rej) => { - job.inactive(err => { - if (err) return rej(err) - return res() - }) - }) + const counts = await queue.getJobCounts() - promises.push(p) - }) + for (const s of states) { + total += counts[s] } - }) + } - return Promise.all(promises) + return total } - private getJob (id: number) { - return new Promise((res, rej) => { - kue.Job.get(id, (err, job) => { - if (err) return rej(err) + async removeOldJobs () { + for (const key of Object.keys(this.queues)) { + const queue = this.queues[key] + await queue.clean(JOB_COMPLETED_LIFETIME, 'completed') + } + } - return res(job) - }) - }) + private addRepeatableJobs () { + this.queues['videos-views'].add({}, { + repeat: REPEAT_JOBS['videos-views'] + }).catch(err => logger.error('Cannot add repeatable job.', { err })) + } + + private filterJobTypes (jobType?: JobType) { + if (!jobType) return jobTypes + + return jobTypes.filter(t => t === jobType) } static get Instance () { @@ -166,5 +243,6 @@ class JobQueue { // --------------------------------------------------------------------------- export { + jobTypes, JobQueue }