ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-server: protect concurrent recording start methods

pull/508/head
pabloFuente 2020-06-12 13:21:56 +02:00
parent d5b3b9dde7
commit a3406d3dfe
2 changed files with 51 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openvidu-server/src/main/java/io/openvidu/server/core/Session.java
View File

@ -80,7 +80,7 @@ public class Session implements SessionInterface {
/** /**
* This lock protects initialization of ALWAYS recordings upon first user * This lock protects initialization of ALWAYS recordings upon first user
* publishing * publishing, as well as POST /api/recordings/start
*/ */
public Lock recordingLock = new ReentrantLock(); public Lock recordingLock = new ReentrantLock();

79
openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManager.java
View File

@ -230,38 +230,59 @@ public class RecordingManager {
} }
public Recording startRecording(Session session, RecordingProperties properties) throws OpenViduException { public Recording startRecording(Session session, RecordingProperties properties) throws OpenViduException {
Recording recording = null;
try { try {
switch (properties.outputMode()) { if (session.recordingLock.tryLock(15, TimeUnit.SECONDS)) {
case COMPOSED: try {
recording = this.composedRecordingService.startRecording(session, properties); if (sessionIsBeingRecorded(session.getSessionId())) {
break; throw new OpenViduException(Code.RECORDING_START_ERROR_CODE,
case INDIVIDUAL: "Concurrent start of recording for session " + session.getSessionId());
recording = this.singleStreamRecordingService.startRecording(session, properties); } else {
break; Recording recording = null;
try {
switch (properties.outputMode()) {
case COMPOSED:
recording = this.composedRecordingService.startRecording(session, properties);
break;
case INDIVIDUAL:
recording = this.singleStreamRecordingService.startRecording(session, properties);
break;
}
} catch (Exception e) {
throw e;
}
this.recordingFromStartingToStarted(recording);
this.cdr.recordRecordingStarted(recording);
this.cdr.recordRecordingStatusChanged(recording, null, recording.getCreatedAt(),
io.openvidu.java.client.Recording.Status.started);
if (!(OutputMode.COMPOSED.equals(properties.outputMode()) && properties.hasVideo())) {
// Directly send recording started notification for all cases except for
// COMPOSED recordings with video (will be sent on first RECORDER subscriber)
this.sessionHandler.sendRecordingStartedNotification(session, recording);
}
if (session.getActivePublishers() == 0) {
// Init automatic recording stop if there are now publishers when starting
// recording
log.info("No publisher in session {}. Starting {} seconds countdown for stopping recording",
session.getSessionId(), this.openviduConfig.getOpenviduRecordingAutostopTimeout());
this.initAutomaticRecordingStopThread(session);
}
return recording;
}
} finally {
session.recordingLock.unlock();
}
} else {
throw new OpenViduException(Code.RECORDING_START_ERROR_CODE,
"Timeout waiting for recording Session lock to be available for session "
+ session.getSessionId());
} }
} catch (Exception e) { } catch (InterruptedException e) {
throw e; throw new OpenViduException(Code.RECORDING_START_ERROR_CODE,
"InterruptedException waiting for recording Session lock to be available for session "
+ session.getSessionId());
} }
this.recordingFromStartingToStarted(recording);
this.cdr.recordRecordingStarted(recording);
this.cdr.recordRecordingStatusChanged(recording, null, recording.getCreatedAt(),
io.openvidu.java.client.Recording.Status.started);
if (!(OutputMode.COMPOSED.equals(properties.outputMode()) && properties.hasVideo())) {
// Directly send recording started notification for all cases except for
// COMPOSED recordings with video (will be sent on first RECORDER subscriber)
this.sessionHandler.sendRecordingStartedNotification(session, recording);
}
if (session.getActivePublishers() == 0) {
// Init automatic recording stop if there are now publishers when starting
// recording
log.info("No publisher in session {}. Starting {} seconds countdown for stopping recording",
session.getSessionId(), this.openviduConfig.getOpenviduRecordingAutostopTimeout());
this.initAutomaticRecordingStopThread(session);
}
return recording;
} }
public Recording stopRecording(Session session, String recordingId, EndReason reason) { public Recording stopRecording(Session session, String recordingId, EndReason reason) {