X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fschedulers%2Fvideos-redundancy-scheduler.ts;h=91c217615f12d989e2c7722baf1d819eb3005b70;hb=6c1da7937cedbc1d4013cff0686d785247229c52;hp=103ab1fab676f5f2225bd6d15bbe05bb1e708a08;hpb=421ff4618da64f0849353383f690a014024c40da;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/schedulers/videos-redundancy-scheduler.ts b/server/lib/schedulers/videos-redundancy-scheduler.ts index 103ab1fab..91c217615 100644 --- a/server/lib/schedulers/videos-redundancy-scheduler.ts +++ b/server/lib/schedulers/videos-redundancy-scheduler.ts @@ -1,12 +1,9 @@ import { move } from 'fs-extra' import { join } from 'path' import { getServerActor } from '@server/models/application/application' -import { TrackerModel } from '@server/models/server/tracker' import { VideoModel } from '@server/models/video/video' import { - MStreamingPlaylist, MStreamingPlaylistFiles, - MStreamingPlaylistVideo, MVideoAccountLight, MVideoFile, MVideoFileVideo, @@ -16,8 +13,8 @@ import { MVideoWithAllFiles } from '@server/types/models' import { VideosRedundancyStrategy } from '../../../shared/models/redundancy' -import { logger } from '../../helpers/logger' -import { downloadWebTorrentVideo, generateMagnetUri } from '../../helpers/webtorrent' +import { logger, loggerTagsFactory } from '../../helpers/logger' +import { downloadWebTorrentVideo } from '../../helpers/webtorrent' import { CONFIG } from '../../initializers/config' import { HLS_REDUNDANCY_DIRECTORY, REDUNDANCY, VIDEO_IMPORT_TIMEOUT } from '../../initializers/constants' import { VideoRedundancyModel } from '../../models/redundancy/video-redundancy' @@ -26,9 +23,11 @@ import { getLocalVideoCacheFileActivityPubUrl, getLocalVideoCacheStreamingPlayli import { getOrCreateAPVideo } from '../activitypub/videos' import { downloadPlaylistSegments } from '../hls' import { removeVideoRedundancy } from '../redundancy' -import { generateHLSRedundancyUrl, generateWebTorrentRedundancyUrl } from '../video-paths' +import { generateHLSRedundancyUrl, generateWebTorrentRedundancyUrl } from '../video-urls' import { AbstractScheduler } from './abstract-scheduler' +const lTags = loggerTagsFactory('redundancy') + type CandidateToDuplicate = { redundancy: VideosRedundancyStrategy video: MVideoWithAllFiles @@ -56,7 +55,7 @@ export class VideosRedundancyScheduler extends AbstractScheduler { const videoToDuplicate = await VideoModel.loadWithFiles(videoId) if (!videoToDuplicate) { - logger.warn('Video to manually duplicate %d does not exist anymore.', videoId) + logger.warn('Video to manually duplicate %d does not exist anymore.', videoId, lTags()) return } @@ -70,7 +69,7 @@ export class VideosRedundancyScheduler extends AbstractScheduler { protected async internalExecute () { for (const redundancyConfig of CONFIG.REDUNDANCY.VIDEOS.STRATEGIES) { - logger.info('Running redundancy scheduler for strategy %s.', redundancyConfig.strategy) + logger.info('Running redundancy scheduler for strategy %s.', redundancyConfig.strategy, lTags()) try { const videoToDuplicate = await this.findVideoToDuplicate(redundancyConfig) @@ -86,15 +85,18 @@ export class VideosRedundancyScheduler extends AbstractScheduler { await this.purgeCacheIfNeeded(candidateToDuplicate) if (await this.isTooHeavy(candidateToDuplicate)) { - logger.info('Video %s is too big for our cache, skipping.', videoToDuplicate.url) + logger.info('Video %s is too big for our cache, skipping.', videoToDuplicate.url, lTags(videoToDuplicate.uuid)) continue } - logger.info('Will duplicate video %s in redundancy scheduler "%s".', videoToDuplicate.url, redundancyConfig.strategy) + logger.info( + 'Will duplicate video %s in redundancy scheduler "%s".', + videoToDuplicate.url, redundancyConfig.strategy, lTags(videoToDuplicate.uuid) + ) await this.createVideoRedundancies(candidateToDuplicate) } catch (err) { - logger.error('Cannot run videos redundancy %s.', redundancyConfig.strategy, { err }) + logger.error('Cannot run videos redundancy %s.', redundancyConfig.strategy, { err, ...lTags() }) } } @@ -113,24 +115,20 @@ export class VideosRedundancyScheduler extends AbstractScheduler { for (const redundancyModel of expired) { try { const redundancyConfig = CONFIG.REDUNDANCY.VIDEOS.STRATEGIES.find(s => s.strategy === redundancyModel.strategy) - const candidate: CandidateToDuplicate = { - redundancy: redundancyConfig, - video: null, - files: [], - streamingPlaylists: [] - } + const { totalUsed } = await VideoRedundancyModel.getStats(redundancyConfig.strategy) // If the administrator disabled the redundancy or decreased the cache size, remove this redundancy instead of extending it - if (!redundancyConfig || await this.isTooHeavy(candidate)) { + if (!redundancyConfig || totalUsed > redundancyConfig.size) { logger.info('Destroying redundancy %s because the cache size %s is too heavy.', redundancyModel.url, redundancyModel.strategy) + await removeVideoRedundancy(redundancyModel) } else { await this.extendsRedundancy(redundancyModel) } } catch (err) { logger.error( - 'Cannot extend or remove expiration of %s video from our redundancy system.', this.buildEntryLogId(redundancyModel), - { err } + 'Cannot extend or remove expiration of %s video from our redundancy system.', + this.buildEntryLogId(redundancyModel), { err, ...lTags(redundancyModel.getVideoUUID()) } ) } } @@ -154,7 +152,10 @@ export class VideosRedundancyScheduler extends AbstractScheduler { try { await removeVideoRedundancy(redundancyModel) } catch (err) { - logger.error('Cannot remove redundancy %s from our redundancy system.', this.buildEntryLogId(redundancyModel)) + logger.error( + 'Cannot remove redundancy %s from our redundancy system.', + this.buildEntryLogId(redundancyModel), lTags(redundancyModel.getVideoUUID()) + ) } } } @@ -178,7 +179,7 @@ export class VideosRedundancyScheduler extends AbstractScheduler { const video = await this.loadAndRefreshVideo(data.video.url) if (!video) { - logger.info('Video %s we want to duplicate does not existing anymore, skipping.', data.video.url) + logger.info('Video %s we want to duplicate does not existing anymore, skipping.', data.video.url, lTags(data.video.uuid)) return } @@ -220,12 +221,9 @@ export class VideosRedundancyScheduler extends AbstractScheduler { const serverActor = await getServerActor() - logger.info('Duplicating %s - %d in videos redundancy with "%s" strategy.', video.url, file.resolution, strategy) - - const trackerUrls = await TrackerModel.listUrlsByVideoId(video.id) - const magnetUri = generateMagnetUri(video, file, trackerUrls) + logger.info('Duplicating %s - %d in videos redundancy with "%s" strategy.', video.url, file.resolution, strategy, lTags(video.uuid)) - const tmpPath = await downloadWebTorrentVideo({ magnetUri }, VIDEO_IMPORT_TIMEOUT) + const tmpPath = await downloadWebTorrentVideo({ uri: file.torrentUrl }, VIDEO_IMPORT_TIMEOUT) const destPath = join(CONFIG.STORAGE.REDUNDANCY_DIR, file.filename) await move(tmpPath, destPath, { overwrite: true }) @@ -243,13 +241,13 @@ export class VideosRedundancyScheduler extends AbstractScheduler { await sendCreateCacheFile(serverActor, video, createdModel) - logger.info('Duplicated %s - %d -> %s.', video.url, file.resolution, createdModel.url) + logger.info('Duplicated %s - %d -> %s.', video.url, file.resolution, createdModel.url, lTags(video.uuid)) } private async createStreamingPlaylistRedundancy ( redundancy: VideosRedundancyStrategy, video: MVideoAccountLight, - playlistArg: MStreamingPlaylist + playlistArg: MStreamingPlaylistFiles ) { let strategy = 'manual' let expiresOn: Date = null @@ -259,16 +257,17 @@ export class VideosRedundancyScheduler extends AbstractScheduler { expiresOn = this.buildNewExpiration(redundancy.minLifetime) } - const playlist = playlistArg as MStreamingPlaylistVideo - playlist.Video = video - + const playlist = Object.assign(playlistArg, { Video: video }) const serverActor = await getServerActor() - logger.info('Duplicating %s streaming playlist in videos redundancy with "%s" strategy.', video.url, strategy) + logger.info('Duplicating %s streaming playlist in videos redundancy with "%s" strategy.', video.url, strategy, lTags(video.uuid)) const destDirectory = join(HLS_REDUNDANCY_DIRECTORY, video.uuid) const masterPlaylistUrl = playlist.getMasterPlaylistUrl(video) - await downloadPlaylistSegments(masterPlaylistUrl, destDirectory, VIDEO_IMPORT_TIMEOUT) + + const maxSizeKB = this.getTotalFileSizes([], [ playlist ]) / 1000 + const toleranceKB = maxSizeKB + ((5 * maxSizeKB) / 100) // 5% more tolerance + await downloadPlaylistSegments(masterPlaylistUrl, destDirectory, VIDEO_IMPORT_TIMEOUT, toleranceKB) const createdModel: MVideoRedundancyStreamingPlaylistVideo = await VideoRedundancyModel.create({ expiresOn, @@ -283,11 +282,11 @@ export class VideosRedundancyScheduler extends AbstractScheduler { await sendCreateCacheFile(serverActor, video, createdModel) - logger.info('Duplicated playlist %s -> %s.', masterPlaylistUrl, createdModel.url) + logger.info('Duplicated playlist %s -> %s.', masterPlaylistUrl, createdModel.url, lTags(video.uuid)) } private async extendsExpirationOf (redundancy: MVideoRedundancyVideo, expiresAfterMs: number) { - logger.info('Extending expiration of %s.', redundancy.url) + logger.info('Extending expiration of %s.', redundancy.url, lTags(redundancy.getVideoUUID())) const serverActor = await getServerActor() @@ -318,10 +317,14 @@ export class VideosRedundancyScheduler extends AbstractScheduler { private async isTooHeavy (candidateToDuplicate: CandidateToDuplicate) { const maxSize = candidateToDuplicate.redundancy.size - const { totalUsed } = await VideoRedundancyModel.getStats(candidateToDuplicate.redundancy.strategy) - const totalWillDuplicate = totalUsed + this.getTotalFileSizes(candidateToDuplicate.files, candidateToDuplicate.streamingPlaylists) + const { totalUsed: alreadyUsed } = await VideoRedundancyModel.getStats(candidateToDuplicate.redundancy.strategy) + + const videoSize = this.getTotalFileSizes(candidateToDuplicate.files, candidateToDuplicate.streamingPlaylists) + const willUse = alreadyUsed + videoSize + + logger.debug('Checking candidate size.', { maxSize, alreadyUsed, videoSize, willUse, ...lTags(candidateToDuplicate.video.uuid) }) - return totalWillDuplicate > maxSize + return willUse > maxSize } private buildNewExpiration (expiresAfterMs: number) { @@ -334,7 +337,7 @@ export class VideosRedundancyScheduler extends AbstractScheduler { return `${object.VideoStreamingPlaylist.getMasterPlaylistUrl(object.VideoStreamingPlaylist.Video)}` } - private getTotalFileSizes (files: MVideoFile[], playlists: MStreamingPlaylistFiles[]) { + private getTotalFileSizes (files: MVideoFile[], playlists: MStreamingPlaylistFiles[]): number { const fileReducer = (previous: number, current: MVideoFile) => previous + current.size let allFiles = files @@ -349,7 +352,7 @@ export class VideosRedundancyScheduler extends AbstractScheduler { // We need more attributes and check if the video still exists const getVideoOptions = { videoObject: videoUrl, - syncParam: { likes: false, dislikes: false, shares: false, comments: false, thumbnail: false, refreshVideo: true }, + syncParam: { rates: false, shares: false, comments: false, thumbnail: false, refreshVideo: true }, fetchType: 'all' as 'all' } const { video } = await getOrCreateAPVideo(getVideoOptions)