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

openvidu-server: gracefully stop recording of sessions closed while recording startup

pull/154/head
pabloFuente 2018-10-08 17:04:26 +02:00
parent 6e7d345774
commit 96540689c2
2 changed files with 91 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
openvidu-server/src/main/java/io/openvidu/server/recording/ComposedRecordingService.java
View File

@ -160,6 +160,40 @@ public class ComposedRecordingService {
String containerId = this.sessionsContainers.remove(session.getSessionId());
this.startedRecordings.remove(recording.getId());
if (containerId == null) {
// Session was closed while recording container was initializing
// Wait until containerId is available and force its stop and removal
Thread t = new Thread(() -> {
log.warn("Session closed while starting recording container");
boolean containerClosed = false;
String containerIdAux;
while (!containerClosed) {
containerIdAux = this.sessionsContainers.remove(session.getSessionId());
if (containerIdAux == null) {
try {
log.warn("Waiting for container to be launched...");
Thread.sleep(500);
} catch (InterruptedException e) {
e.printStackTrace();
}
} else {
log.warn("Removing container {} for closed session {}...", containerIdAux,
session.getSessionId());
dockerClient.stopContainerCmd(containerIdAux).exec();
this.removeDockerContainer(containerIdAux);
containerClosed = true;
log.warn("Container {} for closed session {} succesfully stopped and removed", containerIdAux,
session.getSessionId());
log.warn("Deleting unusable files for recording {}", recording.getId());
if (HttpStatus.NO_CONTENT.equals(this.deleteRecordingFromHost(recording.getId(), true))) {
log.warn("Files properly deleted");
}
}
}
});
t.start();
} else {
// Gracefully stop ffmpeg process
ExecCreateCmdResponse execCreateCmdResponse = dockerClient.execCreateCmd(containerId).withAttachStdout(true)
.withAttachStderr(true).withCmd("bash", "-c", "echo 'q' > stop").exec();
@ -215,9 +249,8 @@ public class ComposedRecordingService {
throw new OpenViduException(Code.RECORDING_REPORT_ERROR_CODE,
"There was an error generating the metadata report file for the recording");
}
this.sessionHandler.sendRecordingStoppedNotification(session, recording, reason);
}
return recording;
}
@ -389,9 +422,10 @@ public class ComposedRecordingService {
return fileNamesNoExtension;
}
public HttpStatus deleteRecordingFromHost(String recordingId) {
public HttpStatus deleteRecordingFromHost(String recordingId, boolean force) {
if (this.startedRecordings.containsKey(recordingId) || this.startingRecordings.containsKey(recordingId)) {
if (!force && (this.startedRecordings.containsKey(recordingId)
|| this.startingRecordings.containsKey(recordingId))) {
// Cannot delete an active recording
return HttpStatus.CONFLICT;
}

2
openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java
View File

@ -411,7 +411,7 @@ public class SessionRestController {
@RequestMapping(value = "/recordings/{recordingId}", method = RequestMethod.DELETE)
public ResponseEntity<?> deleteRecording(@PathVariable("recordingId") String recordingId) {
return new ResponseEntity<>(this.recordingService.deleteRecordingFromHost(recordingId));
return new ResponseEntity<>(this.recordingService.deleteRecordingFromHost(recordingId, false));
}
private ResponseEntity<String> generateErrorResponse(String errorMessage, String path, HttpStatus status) {