diff options
author | Chocobozzz <me@florianbigard.com> | 2022-08-09 13:21:18 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-08-09 13:21:18 +0200 |
commit | 51335c72cf1119a92901edeaa5c7dfc1feef3ca4 (patch) | |
tree | 024091083b237ade367b63af8c48c4d7e027fa62 /server/lib/hls.ts | |
parent | e2b2c726b1c1c31794d324c3afd7c24e1f953131 (diff) | |
download | PeerTube-51335c72cf1119a92901edeaa5c7dfc1feef3ca4.tar.gz PeerTube-51335c72cf1119a92901edeaa5c7dfc1feef3ca4.tar.zst PeerTube-51335c72cf1119a92901edeaa5c7dfc1feef3ca4.zip |
Prevent job failure on concurrent HLS transcoding
Diffstat (limited to 'server/lib/hls.ts')
-rw-r--r-- | server/lib/hls.ts | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/server/lib/hls.ts b/server/lib/hls.ts index ad29e4c90..9ec931b4f 100644 --- a/server/lib/hls.ts +++ b/server/lib/hls.ts | |||
@@ -35,15 +35,19 @@ async function updateStreamingPlaylistsInfohashesIfNeeded () { | |||
35 | } | 35 | } |
36 | 36 | ||
37 | async function updatePlaylistAfterFileChange (video: MVideo, playlist: MStreamingPlaylist) { | 37 | async function updatePlaylistAfterFileChange (video: MVideo, playlist: MStreamingPlaylist) { |
38 | let playlistWithFiles = await updateMasterHLSPlaylist(video, playlist) | 38 | try { |
39 | playlistWithFiles = await updateSha256VODSegments(video, playlist) | 39 | let playlistWithFiles = await updateMasterHLSPlaylist(video, playlist) |
40 | 40 | playlistWithFiles = await updateSha256VODSegments(video, playlist) | |
41 | // Refresh playlist, operations can take some time | 41 | |
42 | playlistWithFiles = await VideoStreamingPlaylistModel.loadWithVideoAndFiles(playlist.id) | 42 | // Refresh playlist, operations can take some time |
43 | playlistWithFiles.assignP2PMediaLoaderInfoHashes(video, playlistWithFiles.VideoFiles) | 43 | playlistWithFiles = await VideoStreamingPlaylistModel.loadWithVideoAndFiles(playlist.id) |
44 | await playlistWithFiles.save() | 44 | playlistWithFiles.assignP2PMediaLoaderInfoHashes(video, playlistWithFiles.VideoFiles) |
45 | 45 | await playlistWithFiles.save() | |
46 | video.setHLSPlaylist(playlistWithFiles) | 46 | |
47 | video.setHLSPlaylist(playlistWithFiles) | ||
48 | } catch (err) { | ||
49 | logger.info('Cannot update playlist after file change. Maybe due to concurrent transcoding', { err }) | ||
50 | } | ||
47 | } | 51 | } |
48 | 52 | ||
49 | // --------------------------------------------------------------------------- | 53 | // --------------------------------------------------------------------------- |