Chocobozzz/PeerTube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2024-09-11 13:37:10 +03:00
Code Issues Projects Releases Wiki Activity

Fix concurrent live streams serialization issue

Browse Source
This commit is contained in:
Chocobozzz 2024-05-16 11:38:36 +02:00
parent e7ebcb16ac
commit 3d105296e6
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
server/core/lib/live/live-manager.ts
View File

@ -7,6 +7,7 @@ import {
hasAudioStream hasAudioStream
} from '@peertube/peertube-ffmpeg' } from '@peertube/peertube-ffmpeg'
import { LiveVideoError, LiveVideoErrorType, VideoState } from '@peertube/peertube-models' import { LiveVideoError, LiveVideoErrorType, VideoState } from '@peertube/peertube-models'
import { retryTransactionWrapper } from '@server/helpers/database-utils.js'
import { logger, loggerTagsFactory } from '@server/helpers/logger.js' import { logger, loggerTagsFactory } from '@server/helpers/logger.js'
import { CONFIG, registerConfigChangedHandler } from '@server/initializers/config.js' import { CONFIG, registerConfigChangedHandler } from '@server/initializers/config.js'
import { VIDEO_LIVE, WEBSERVER } from '@server/initializers/constants.js' import { VIDEO_LIVE, WEBSERVER } from '@server/initializers/constants.js'
@ -19,6 +20,7 @@ import { VideoLiveModel } from '@server/models/video/video-live.js'
import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist.js' import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist.js'
import { VideoModel } from '@server/models/video/video.js' import { VideoModel } from '@server/models/video/video.js'
import { MUser, MVideo, MVideoLiveSession, MVideoLiveVideo, MVideoLiveVideoWithSetting } from '@server/types/models/index.js' import { MUser, MVideo, MVideoLiveSession, MVideoLiveVideo, MVideoLiveVideoWithSetting } from '@server/types/models/index.js'
import { FfprobeData } from 'fluent-ffmpeg'
import { readFile, readdir } from 'fs/promises' import { readFile, readdir } from 'fs/promises'
import { Server, createServer } from 'net' import { Server, createServer } from 'net'
import context from 'node-media-server/src/node_core_ctx.js' import context from 'node-media-server/src/node_core_ctx.js'
@ -36,7 +38,6 @@ import { computeResolutionsToTranscode } from '../transcoding/transcoding-resolu
import { LiveQuotaStore } from './live-quota-store.js' import { LiveQuotaStore } from './live-quota-store.js'
import { cleanupAndDestroyPermanentLive, getLiveSegmentTime } from './live-utils.js' import { cleanupAndDestroyPermanentLive, getLiveSegmentTime } from './live-utils.js'
import { MuxingSession } from './shared/index.js' import { MuxingSession } from './shared/index.js'
import { FfprobeData } from 'fluent-ffmpeg'
// Disable node media server logs // Disable node media server logs
nodeMediaServerLogger.setLogType(0) nodeMediaServerLogger.setLogType(0)
@ -84,7 +85,7 @@ class LiveManager {
const inputPublicUrl = session.inputOriginPublicUrl + streamPath const inputPublicUrl = session.inputOriginPublicUrl + streamPath
this.handleSession({ sessionId, inputPublicUrl, inputLocalUrl, streamKey: splittedPath[2] }) this.handleSession({ sessionId, inputPublicUrl, inputLocalUrl, streamKey: splittedPath[2] })
.catch(err => logger.error('Cannot handle sessions.', { err, ...lTags(sessionId) })) .catch(err => logger.error('Cannot handle session', { err, ...lTags(sessionId) }))
}) })
events.on('donePublish', (sessionId: string) => { events.on('donePublish', (sessionId: string) => {
@ -558,25 +559,27 @@ class LiveManager {
return resolutionsEnabled return resolutionsEnabled
} }
private async saveStartingSession (videoLive: MVideoLiveVideoWithSetting) { private saveStartingSession (videoLive: MVideoLiveVideoWithSetting) {
const replaySettings = videoLive.saveReplay const replaySettings = videoLive.saveReplay
? new VideoLiveReplaySettingModel({ ? new VideoLiveReplaySettingModel({
privacy: videoLive.ReplaySetting.privacy privacy: videoLive.ReplaySetting.privacy
}) })
: null : null
return sequelizeTypescript.transaction(async t => { return retryTransactionWrapper(() => {
if (videoLive.saveReplay) { return sequelizeTypescript.transaction(async t => {
await replaySettings.save({ transaction: t }) if (videoLive.saveReplay) {
} await replaySettings.save({ transaction: t })
}
return VideoLiveSessionModel.create({ return VideoLiveSessionModel.create({
startDate: new Date(), startDate: new Date(),
liveVideoId: videoLive.videoId, liveVideoId: videoLive.videoId,
saveReplay: videoLive.saveReplay, saveReplay: videoLive.saveReplay,
replaySettingId: videoLive.saveReplay ? replaySettings.id : null, replaySettingId: videoLive.saveReplay ? replaySettings.id : null,
endingProcessed: false endingProcessed: false
}, { transaction: t }) }, { transaction: t })
})
}) })
} }