From b42c2c7e89a64ed730d8140840fe74a13c31f2a4 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 9 Aug 2022 09:09:31 +0200 Subject: Avoid concurrency issue on transcoding --- server/controllers/api/videos/transcoding.ts | 90 ++++++++++++++++++++++------ 1 file changed, 72 insertions(+), 18 deletions(-) (limited to 'server/controllers') diff --git a/server/controllers/api/videos/transcoding.ts b/server/controllers/api/videos/transcoding.ts index b2b71a870..9aca761c1 100644 --- a/server/controllers/api/videos/transcoding.ts +++ b/server/controllers/api/videos/transcoding.ts @@ -1,10 +1,12 @@ +import Bluebird from 'bluebird' import express from 'express' import { computeResolutionsToTranscode } from '@server/helpers/ffmpeg' import { logger, loggerTagsFactory } from '@server/helpers/logger' -import { addTranscodingJob } from '@server/lib/video' +import { JobQueue } from '@server/lib/job-queue' +import { Hooks } from '@server/lib/plugins/hooks' +import { buildTranscodingJob } from '@server/lib/video' import { HttpStatusCode, UserRight, VideoState, VideoTranscodingCreate } from '@shared/models' import { asyncMiddleware, authenticate, createTranscodingValidator, ensureUserHasRight } from '../../../middlewares' -import { Hooks } from '@server/lib/plugins/hooks' const lTags = loggerTagsFactory('api', 'video') const transcodingRouter = express.Router() @@ -44,29 +46,81 @@ async function createTranscoding (req: express.Request, res: express.Response) { video.state = VideoState.TO_TRANSCODE await video.save() - for (const resolution of resolutions) { + const hasAudio = !!audioStream + const childrenResolutions = resolutions.filter(r => r !== maxResolution) + + const children = await Bluebird.mapSeries(childrenResolutions, resolution => { if (body.transcodingType === 'hls') { - await addTranscodingJob({ - type: 'new-resolution-to-hls', + return buildHLSJobOption({ videoUUID: video.uuid, + hasAudio, resolution, - hasAudio: !!audioStream, - copyCodecs: false, - isNewVideo: false, - autoDeleteWebTorrentIfNeeded: false, - isMaxQuality: maxResolution === resolution + isMaxQuality: false }) - } else if (body.transcodingType === 'webtorrent') { - await addTranscodingJob({ - type: 'new-resolution-to-webtorrent', + } + + if (body.transcodingType === 'webtorrent') { + return buildWebTorrentJobOption({ videoUUID: video.uuid, - isNewVideo: false, - resolution, - hasAudio: !!audioStream, - createHLSIfNeeded: false + hasAudio, + resolution }) } - } + }) + + const parent = body.transcodingType === 'hls' + ? await buildHLSJobOption({ + videoUUID: video.uuid, + hasAudio, + resolution: maxResolution, + isMaxQuality: false + }) + : await buildWebTorrentJobOption({ + videoUUID: video.uuid, + hasAudio, + resolution: maxResolution + }) + + // Porcess the last resolution after the other ones to prevent concurrency issue + // Because low resolutions use the biggest one as ffmpeg input + await JobQueue.Instance.createJobWithChildren(parent, children) return res.sendStatus(HttpStatusCode.NO_CONTENT_204) } + +function buildHLSJobOption (options: { + videoUUID: string + hasAudio: boolean + resolution: number + isMaxQuality: boolean +}) { + const { videoUUID, hasAudio, resolution, isMaxQuality } = options + + return buildTranscodingJob({ + type: 'new-resolution-to-hls', + videoUUID, + resolution, + hasAudio, + copyCodecs: false, + isNewVideo: false, + autoDeleteWebTorrentIfNeeded: false, + isMaxQuality + }) +} + +function buildWebTorrentJobOption (options: { + videoUUID: string + hasAudio: boolean + resolution: number +}) { + const { videoUUID, hasAudio, resolution } = options + + return buildTranscodingJob({ + type: 'new-resolution-to-webtorrent', + videoUUID, + isNewVideo: false, + resolution, + hasAudio, + createHLSIfNeeded: false + }) +} -- cgit v1.2.3