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

openvidu-server: store Media Node num of sessions, connections and composed recordings

pull/609/head
pabloFuente 2021-02-10 21:32:34 +01:00
parent 1c63047a69
commit 45dc06fb59
4 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openvidu-server/src/main/java/io/openvidu/server/core/Session.java
View File

@ -272,4 +272,8 @@ public class Session implements SessionInterface {
return false; return false;
} }
public int getNumberOfConnections() {
return this.participants.size();
}
} }

1
openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSession.java
View File

@ -347,6 +347,7 @@ public class KurentoSession extends Session {
public int getNumberOfWebrtcConnections() { public int getNumberOfWebrtcConnections() {
return this.getActivePublishers() + this.participants.values().stream() return this.getActivePublishers() + this.participants.values().stream()
.filter(p -> !ProtocolElements.RECORDER_PARTICIPANT_PUBLICID.equals(p.getParticipantPublicId()))
.mapToInt(p -> ((KurentoParticipant) p).getSubscribers().size()).reduce(0, Integer::sum); .mapToInt(p -> ((KurentoParticipant) p).getSubscribers().size()).reduce(0, Integer::sum);
} }

7
openvidu-server/src/main/java/io/openvidu/server/kurento/kms/FixedOneKmsManager.java
View File

@ -71,17 +71,16 @@ public class FixedOneKmsManager extends KmsManager {
@Override @Override
public void incrementActiveRecordings(RecordingProperties properties, String recordingId, Session session) { public void incrementActiveRecordings(RecordingProperties properties, String recordingId, Session session) {
try { try {
this.getKmss().iterator().next().incrementActiveRecordings(recordingId, session.getSessionId()); this.getKmss().iterator().next().incrementActiveRecordings(session.getSessionId(), recordingId, properties);
} catch (NoSuchElementException e) { } catch (NoSuchElementException e) {
log.error("There is no KMS available when incrementing active recordings"); log.error("There is no KMS available when incrementing active recordings");
} }
} }
@Override @Override
public void decrementActiveRecordings(RecordingProperties recordingProperties, String recordingId, public void decrementActiveRecordings(RecordingProperties properties, String recordingId, Session session) {
Session session) {
try { try {
this.getKmss().iterator().next().decrementActiveRecordings(recordingId); this.getKmss().iterator().next().decrementActiveRecordings(recordingId, properties);
} catch (NoSuchElementException e) { } catch (NoSuchElementException e) {
log.error("There is no KMS available when decrementing active recordings"); log.error("There is no KMS available when decrementing active recordings");
} }

25
openvidu-server/src/main/java/io/openvidu/server/kurento/kms/Kms.java
View File

@ -36,8 +36,10 @@ import org.slf4j.LoggerFactory;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import io.openvidu.java.client.RecordingProperties;
import io.openvidu.server.kurento.core.KurentoSession; import io.openvidu.server.kurento.core.KurentoSession;
import io.openvidu.server.utils.QuarantineKiller; import io.openvidu.server.utils.QuarantineKiller;
import io.openvidu.server.utils.RecordingUtils;
import io.openvidu.server.utils.UpdatableTimerTask; import io.openvidu.server.utils.UpdatableTimerTask;
/** /**
@ -69,6 +71,7 @@ public class Kms {
private Map<String, KurentoSession> kurentoSessions = new ConcurrentHashMap<>(); private Map<String, KurentoSession> kurentoSessions = new ConcurrentHashMap<>();
private Map<String, String> activeRecordings = new ConcurrentHashMap<>(); private Map<String, String> activeRecordings = new ConcurrentHashMap<>();
private AtomicLong activeComposedRecordings = new AtomicLong();
public Kms(KmsProperties props, LoadManager loadManager, QuarantineKiller quarantineKiller) { public Kms(KmsProperties props, LoadManager loadManager, QuarantineKiller quarantineKiller) {
this.id = props.getId(); this.id = props.getId();
@ -163,12 +166,19 @@ public class Kms {
return this.activeRecordings.entrySet(); return this.activeRecordings.entrySet();
} }
public synchronized void incrementActiveRecordings(String recordingId, String sessionId) { public synchronized void incrementActiveRecordings(String sessionId, String recordingId,
RecordingProperties properties) {
this.activeRecordings.put(recordingId, sessionId); this.activeRecordings.put(recordingId, sessionId);
if (RecordingUtils.IS_COMPOSED(properties.outputMode())) {
this.activeComposedRecordings.incrementAndGet();
}
} }
public synchronized void decrementActiveRecordings(String recordingId) { public synchronized void decrementActiveRecordings(String recordingId, RecordingProperties properties) {
this.activeRecordings.remove(recordingId); this.activeRecordings.remove(recordingId);
if (RecordingUtils.IS_COMPOSED(properties.outputMode())) {
this.activeComposedRecordings.decrementAndGet();
}
this.quarantineKiller.dropMediaNode(this.id); this.quarantineKiller.dropMediaNode(this.id);
} }
@ -250,9 +260,18 @@ public class Kms {
return this.uri; return this.uri;
} }
public int getNumberOfConnections() {
return this.kurentoSessions.values().stream().mapToInt(kSession -> kSession.getNumberOfConnections()).reduce(0,
Integer::sum);
}
public int getNumberOfWebrtcConnections() { public int getNumberOfWebrtcConnections() {
return this.kurentoSessions.values().stream().mapToInt(session -> session.getNumberOfWebrtcConnections()) return this.kurentoSessions.values().stream().mapToInt(kSession -> kSession.getNumberOfWebrtcConnections())
.reduce(0, Integer::sum); .reduce(0, Integer::sum);
} }
public int getNumberOfComposedRecordings() {
return this.activeComposedRecordings.intValue();
}
} }