OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Lock files to generate torrents/move files

pull/5378/head
Chocobozzz 2022-10-25 11:50:44 +02:00
parent 2e3b0825bb
commit 849f0fd3b2
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
server/lib/job-queue/handlers/manage-video-torrent.ts
View File

@ -1,5 +1,7 @@
import { Job } from 'bullmq'
import { extractVideo } from '@server/helpers/video'
import { createTorrentAndSetInfoHash, updateTorrentMetadata } from '@server/helpers/webtorrent'
import { VideoPathManager } from '@server/lib/video-path-manager'
import { VideoModel } from '@server/models/video/video'
import { VideoFileModel } from '@server/models/video/video-file'
import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist'
@ -30,17 +32,23 @@ async function doCreateAction (payload: ManageVideoTorrentPayload & { action: 'c
if (!video || !file) return
await createTorrentAndSetInfoHash(video, file)
const fileMutexReleaser = await VideoPathManager.Instance.lockFiles(video.uuid)
// Refresh videoFile because the createTorrentAndSetInfoHash could be long
const refreshedFile = await VideoFileModel.loadWithVideo(file.id)
// File does not exist anymore, remove the generated torrent
if (!refreshedFile) return file.removeTorrent()
try {
await createTorrentAndSetInfoHash(video, file)
refreshedFile.infoHash = file.infoHash
refreshedFile.torrentFilename = file.torrentFilename
// Refresh videoFile because the createTorrentAndSetInfoHash could be long
const refreshedFile = await VideoFileModel.loadWithVideo(file.id)
// File does not exist anymore, remove the generated torrent
if (!refreshedFile) return file.removeTorrent()
return refreshedFile.save()
refreshedFile.infoHash = file.infoHash
refreshedFile.torrentFilename = file.torrentFilename
await refreshedFile.save()
} finally {
fileMutexReleaser()
}
}
async function doUpdateMetadataAction (payload: ManageVideoTorrentPayload & { action: 'update-metadata' }) {
@ -52,9 +60,16 @@ async function doUpdateMetadataAction (payload: ManageVideoTorrentPayload & { ac
if ((!video && !streamingPlaylist) || !file) return
await updateTorrentMetadata(video || streamingPlaylist, file)
const extractedVideo = extractVideo(video || streamingPlaylist)
const fileMutexReleaser = await VideoPathManager.Instance.lockFiles(extractedVideo.uuid)
await file.save()
try {
await updateTorrentMetadata(video || streamingPlaylist, file)
await file.save()
} finally {
fileMutexReleaser()
}
}
async function loadVideoOrLog (videoId: number) {

6
server/lib/job-queue/handlers/move-to-object-storage.ts
View File

@ -28,6 +28,8 @@ export async function processMoveToObjectStorage (job: Job) {
const lTags = lTagsBase(video.uuid, video.url)
const fileMutexReleaser = await VideoPathManager.Instance.lockFiles(video.uuid)
try {
if (video.VideoFiles) {
logger.debug('Moving %d webtorrent files for video %s.', video.VideoFiles.length, video.uuid, lTags)
@ -49,6 +51,10 @@ export async function processMoveToObjectStorage (job: Job) {
}
} catch (err) {
await onMoveToObjectStorageFailure(job, err)
throw err
} finally {
fileMutexReleaser()
}
return payload.videoUUID