diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedQuickStartRecordingService.java b/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedQuickStartRecordingService.java index 530e5817..61a29943 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedQuickStartRecordingService.java +++ b/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedQuickStartRecordingService.java @@ -58,7 +58,6 @@ public class ComposedQuickStartRecordingService extends ComposedRecordingService session.getSessionId()); } - containers.remove(containerId); sessionsContainers.remove(session.getSessionId()); } @@ -219,7 +218,8 @@ public class ComposedQuickStartRecordingService extends ComposedRecordingService String containerId = null; try { - final String container = openviduConfig.getOpenviduRecordingImageRepo() + ":" + openviduConfig.getOpenViduRecordingVersion(); + final String container = openviduConfig.getOpenviduRecordingImageRepo() + ":" + + openviduConfig.getOpenViduRecordingVersion(); final String containerName = "recording_" + session.getSessionId(); Volume volume1 = new Volume("/recordings"); List volumes = new ArrayList<>(); @@ -230,12 +230,10 @@ public class ComposedQuickStartRecordingService extends ComposedRecordingService containerId = dockerManager.runContainer(properties.mediaNode(), container, containerName, null, volumes, binds, "host", envs, null, properties.shmSize(), false, null, openviduConfig.isOpenviduRecordingGPUEnabled()); - containers.put(containerId, containerName); this.sessionsContainers.put(session.getSessionId(), containerId); } catch (Exception e) { if (containerId != null) { dockerManager.removeContainer(properties.mediaNode(), containerId, true); - containers.remove(containerId); sessionsContainers.remove(session.getSessionId()); } log.error("Error while launching container for COMPOSED_QUICK_START: ({})", e.getMessage()); diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java b/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java index be62c550..9ade2997 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java +++ b/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java @@ -66,7 +66,6 @@ public class ComposedRecordingService extends RecordingService { private static final Logger log = LoggerFactory.getLogger(ComposedRecordingService.class); - protected Map containers = new ConcurrentHashMap<>(); protected Map sessionsContainers = new ConcurrentHashMap<>(); private Map composites = new ConcurrentHashMap<>(); @@ -164,7 +163,8 @@ public class ComposedRecordingService extends RecordingService { String containerId; try { - final String container = openviduConfig.getOpenviduRecordingImageRepo() + ":" + openviduConfig.getOpenViduRecordingVersion(); + final String container = openviduConfig.getOpenviduRecordingImageRepo() + ":" + + openviduConfig.getOpenViduRecordingVersion(); final String containerName = "recording_" + recording.getId(); Volume volume1 = new Volume("/recordings"); List volumes = new ArrayList<>(); @@ -175,7 +175,6 @@ public class ComposedRecordingService extends RecordingService { containerId = dockerManager.runContainer(properties.mediaNode(), container, containerName, null, volumes, binds, "host", envs, null, properties.shmSize(), false, null, openviduConfig.isOpenviduRecordingGPUEnabled()); - containers.put(containerId, containerName); } catch (Exception e) { this.cleanRecordingMaps(recording); throw this.failStartRecording(session, recording, @@ -272,7 +271,6 @@ public class ComposedRecordingService extends RecordingService { session.getSessionId()); dockerManager.removeContainer(recordingAux.getRecordingProperties().mediaNode(), containerIdAux, true); - containers.remove(containerId); containerClosed = true; log.warn("Container {} for closed session {} succesfully stopped and removed", containerIdAux, session.getSessionId()); @@ -405,7 +403,6 @@ public class ComposedRecordingService extends RecordingService { // Remove container dockerManager.removeContainer(recording.getRecordingProperties().mediaNode(), containerId, false); - containers.remove(containerId); } protected void updateRecordingAttributes(Recording recording) { @@ -445,7 +442,6 @@ public class ComposedRecordingService extends RecordingService { recording.setStatus(io.openvidu.java.client.Recording.Status.failed); if (removeContainer) { dockerManager.removeContainer(recording.getRecordingProperties().mediaNode(), containerId, true); - containers.remove(containerId); } sealRecordingMetadataFileAsReady(recording, recording.getSize(), recording.getDuration(), getMetadataFilePath(recording));