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

openvidu-server: change mustRemoveMediaNode behavior in KmsManager

pull/711/head
pabloFuente 2022-03-25 14:11:28 +01:00
parent 2a3e05ef80
commit 44363dbde0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openvidu-server/src/main/java/io/openvidu/server/kurento/kms/KmsManager.java
View File

@ -244,7 +244,7 @@ public abstract class KmsManager {
kms.getKurentoClientReconnectTimer().cancelTimer(); kms.getKurentoClientReconnectTimer().cancelTimer();
boolean mustRetryReconnection = accumulatedTimeout < openviduConfig.getReconnectionTimeout(); boolean mustRetryReconnection = accumulatedTimeout < openviduConfig.getReconnectionTimeout();
boolean mustRemoveMediaNode = true; boolean mustRemoveMediaNode = !mustRetryReconnection;
if (!kms.hasTriggeredNodeCrashedEvent()) { if (!kms.hasTriggeredNodeCrashedEvent()) {
@ -252,8 +252,8 @@ public abstract class KmsManager {
"OpenVidu Server [{}] could not reconnect to Media Node {} with IP {} in {} seconds. Media Node crashed", "OpenVidu Server [{}] could not reconnect to Media Node {} with IP {} in {} seconds. Media Node crashed",
kms.getKurentoClient().toString(), kms.getId(), kms.getIp(), kms.getKurentoClient().toString(), kms.getId(), kms.getIp(),
(INTERVAL_WAIT_MS * RECONNECTION_LOOPS / 1000)); (INTERVAL_WAIT_MS * RECONNECTION_LOOPS / 1000));
mustRemoveMediaNode = !mustRetryReconnection; nodeCrashedHandler(kms, mustRemoveMediaNode);
nodeCrashedHandler(kms, mustRetryReconnection); mustRemoveMediaNode = false; // nodeCrashed handler will have taken care of it
} else { } else {
@ -312,7 +312,7 @@ public abstract class KmsManager {
kurentoClientReconnectTimer.updateTimer(); kurentoClientReconnectTimer.updateTimer();
} }
private void nodeCrashedHandler(Kms kms, boolean mustRetryReconnection) { private void nodeCrashedHandler(Kms kms, boolean mustRemoveMediaNode) {
kms.setHasTriggeredNodeCrashedEvent(true); kms.setHasTriggeredNodeCrashedEvent(true);
@ -327,8 +327,8 @@ public abstract class KmsManager {
sessionEventsHandler.onMediaNodeCrashed(kms, environmentId, timeOfKurentoDisconnection, sessionEventsHandler.onMediaNodeCrashed(kms, environmentId, timeOfKurentoDisconnection,
affectedSessionIds, affectedRecordingIds); affectedSessionIds, affectedRecordingIds);
// 2. Remove Media Node from cluster // 2. Remove Media Node from cluster if necessary
if (!mustRetryReconnection) { if (mustRemoveMediaNode) {
removeMediaNodeUponCrash(kms.getId()); removeMediaNodeUponCrash(kms.getId());
} }