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

openvidu-test-e2e: fix Kurento reconnect test

pull/553/head
pabloFuente 2020-10-23 20:42:19 +02:00
parent d358562033
commit dff5f8f5d4
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java
View File

@ -118,7 +118,6 @@ public class KurentoSessionManager extends SessionManager {
} finally { } finally {
KmsManager.selectAndRemoveKmsLock.unlock(); KmsManager.selectAndRemoveKmsLock.unlock();
} }
} else { } else {
String error = "Timeout of " + KmsManager.MAX_SECONDS_LOCK_WAIT String error = "Timeout of " + KmsManager.MAX_SECONDS_LOCK_WAIT
+ " seconds waiting to acquire lock"; + " seconds waiting to acquire lock";
@ -1174,7 +1173,7 @@ public class KurentoSessionManager extends SessionManager {
this.cleanCollections(session.getSessionId()); this.cleanCollections(session.getSessionId());
this.storeSessionNotActive(session); this.storeSessionNotActive(session);
throw new OpenViduException(Code.ROOM_CANNOT_BE_CREATED_ERROR_CODE, throw new OpenViduException(Code.ROOM_CANNOT_BE_CREATED_ERROR_CODE,
"There is no available Media Node where to initialize session '" + session + "'"); "There is no available Media Node where to initialize session '" + session.getSessionId() + "'");
} }
log.info("KMS less loaded is {} with a load of {}", lessLoadedKms.getUri(), lessLoadedKms.getLoad()); log.info("KMS less loaded is {} with a load of {}", lessLoadedKms.getUri(), lessLoadedKms.getLoad());
return lessLoadedKms; return lessLoadedKms;

2
openvidu-server/src/main/java/io/openvidu/server/utils/MediaNodeStatusManager.java
View File

@ -12,4 +12,6 @@ public interface MediaNodeStatusManager {
public boolean isWaitingIdleToTerminate(String mediaNodeId); public boolean isWaitingIdleToTerminate(String mediaNodeId);
public String instanceStatus(String mediaNodeId);
} }

5
openvidu-server/src/main/java/io/openvidu/server/utils/MediaNodeStatusManagerDummy.java
View File

@ -27,4 +27,9 @@ public class MediaNodeStatusManagerDummy implements MediaNodeStatusManager {
return false; return false;
} }
@Override
public String instanceStatus(String mediaNodeId) {
return null;
}
} }