From f2582aa7ced72e389f8259d31234b5638c5ff71c Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Tue, 26 Jan 2021 17:22:34 +0100
Subject: [PATCH] openvidu-server: fix KurentoClient reconnection timer
 behavior (one per Kms)

---
 .../io/openvidu/server/kurento/kms/Kms.java    | 18 ++++++++++++++----
 .../server/kurento/kms/KmsManager.java         | 17 ++++++++---------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/Kms.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/Kms.java
index bcdd10f9..65c1bda4 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/Kms.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/kms/Kms.java
@@ -38,6 +38,7 @@ import com.google.gson.JsonObject;
 
 import io.openvidu.server.kurento.core.KurentoSession;
 import io.openvidu.server.utils.QuarantineKiller;
+import io.openvidu.server.utils.UpdatableTimerTask;
 
 /**
  * Abstraction of a KMS instance: an object of this class corresponds to a KMS
@@ -58,6 +59,7 @@ public class Kms {
 	private String uri;
 	private String ip;
 	private KurentoClient client;
+	private UpdatableTimerTask clientReconnectTimer;
 	private LoadManager loadManager;
 	private QuarantineKiller quarantineKiller;
 
@@ -85,10 +87,22 @@ public class Kms {
 		this.quarantineKiller = quarantineKiller;
 	}
 
+	public KurentoClient getKurentoClient() {
+		return this.client;
+	}
+
 	public void setKurentoClient(KurentoClient client) {
 		this.client = client;
 	}
 
+	public UpdatableTimerTask getKurentoClientReconnectTimer() {
+		return this.clientReconnectTimer;
+	}
+
+	public void setKurentoClientReconnectTimer(UpdatableTimerTask clientReconnectTimer) {
+		this.clientReconnectTimer = clientReconnectTimer;
+	}
+
 	public String getId() {
 		return id;
 	}
@@ -101,10 +115,6 @@ public class Kms {
 		return ip;
 	}
 
-	public KurentoClient getKurentoClient() {
-		return this.client;
-	}
-
 	public double getLoad() {
 		return loadManager.calculateLoad(this);
 	}
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 b1fcab94..7305d05a 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
@@ -60,8 +60,6 @@ public abstract class KmsManager {
 	public static final Lock selectAndRemoveKmsLock = new ReentrantLock(true);
 	public static final int MAX_SECONDS_LOCK_WAIT = 15;
 
-	private UpdatableTimerTask kurentoReconnectTimer;
-
 	public class KmsLoad implements Comparable<KmsLoad> {
 
 		private Kms kms;
@@ -204,12 +202,12 @@ public abstract class KmsManager {
 				final AtomicInteger iteration = new AtomicInteger(loops);
 				final long intervalWaitMs = 500L;
 
-				kurentoReconnectTimer = new UpdatableTimerTask(() -> {
+				final UpdatableTimerTask kurentoClientReconnectTimer = new UpdatableTimerTask(() -> {
 					if (iteration.decrementAndGet() < 0) {
 
 						log.error("KurentoClient [{}] could not reconnect to KMS with uri {} in {} seconds",
 								kms.getKurentoClient().toString(), kms.getUri(), (intervalWaitMs * 6 / 1000));
-						kurentoReconnectTimer.cancelTimer();
+						kms.getKurentoClientReconnectTimer().cancelTimer();
 						log.warn("Closing {} sessions hosted by KMS with uri {}: {}", kms.getKurentoSessions().size(),
 								kms.getUri(), kms.getKurentoSessions().stream().map(s -> s.getSessionId())
 										.collect(Collectors.joining(",", "[", "]")));
@@ -234,7 +232,7 @@ public abstract class KmsManager {
 
 						log.info("According to Timer KMS with uri {} and KurentoClient [{}] is now reconnected",
 								kms.getUri(), kms.getKurentoClient().toString());
-						kurentoReconnectTimer.cancelTimer();
+						kms.getKurentoClientReconnectTimer().cancelTimer();
 						kms.setKurentoClientConnected(true);
 						kms.setTimeOfKurentoClientConnection(System.currentTimeMillis());
 
@@ -260,7 +258,8 @@ public abstract class KmsManager {
 					}
 				}, () -> intervalWaitMs); // Try 2 times per seconds
 
-				kurentoReconnectTimer.updateTimer();
+				kms.setKurentoClientReconnectTimer(kurentoClientReconnectTimer);
+				kurentoClientReconnectTimer.updateTimer();
 			}
 
 			@Override
@@ -314,11 +313,11 @@ public abstract class KmsManager {
 
 	@PreDestroy
 	public void close() {
-		if (kurentoReconnectTimer != null) {
-			kurentoReconnectTimer.cancelTimer();
-		}
 		log.info("Closing all KurentoClients");
 		this.kmss.values().forEach(kms -> {
+			if (kms.getKurentoClientReconnectTimer() != null) {
+				kms.getKurentoClientReconnectTimer().cancelTimer();
+			}
 			kms.getKurentoClient().destroy();
 		});
 	}