From 72c62772f2e22c3fc0f3d21cb181fcdf9c1b2cef Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Sun, 17 May 2020 18:12:32 +0200 Subject: [PATCH] openvidu-server: KmsManager.MAX_SECONDS_LOCK_WAIT --- .../openvidu/server/kurento/core/KurentoSessionManager.java | 6 ++---- .../java/io/openvidu/server/kurento/kms/KmsManager.java | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java index 1cf66bdc..3db64363 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java @@ -82,8 +82,6 @@ public class KurentoSessionManager extends SessionManager { @Autowired private KurentoParticipantEndpointConfig kurentoEndpointConfig; - private final int MS_MAX_LOCK_WAIT = 15; - @Override /* Protected by Session.closingLock.readLock */ public void joinRoom(Participant participant, String sessionId, Integer transactionId) { @@ -105,7 +103,7 @@ public class KurentoSessionManager extends SessionManager { } try { - if (KmsManager.selectAndRemoveKmsLock.tryLock(MS_MAX_LOCK_WAIT, TimeUnit.SECONDS)) { + if (KmsManager.selectAndRemoveKmsLock.tryLock(KmsManager.MAX_SECONDS_LOCK_WAIT, TimeUnit.SECONDS)) { try { kSession = (KurentoSession) sessions.get(sessionId); @@ -131,7 +129,7 @@ public class KurentoSessionManager extends SessionManager { } } else { - String error = "Timeout of " + MS_MAX_LOCK_WAIT + " seconds waiting to acquire lock"; + String error = "Timeout of " + KmsManager.MAX_SECONDS_LOCK_WAIT + " seconds waiting to acquire lock"; log.error(error); sessionEventsHandler.onParticipantJoined(participant, sessionId, null, transactionId, new OpenViduException(Code.ROOM_CANNOT_BE_CREATED_ERROR_CODE, error)); diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java index ea2e92f8..2a8063b6 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java @@ -49,6 +49,7 @@ public abstract class KmsManager { protected static final Logger log = LoggerFactory.getLogger(KmsManager.class); public static final Lock selectAndRemoveKmsLock = new ReentrantLock(true); + public static final int MAX_SECONDS_LOCK_WAIT = 15; private Map kmsReconnectionLocks = new ConcurrentHashMap<>();