Make the colibri queue unbounded; include its stats in queue stats. (#…

…1699)
jitsi · Aug 4, 2021 · c450354 · c450354
1 parent 5b4158a
commit c450354
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/jvb/src/main/java/org/jitsi/videobridge/Videobridge.java b/jvb/src/main/java/org/jitsi/videobridge/Videobridge.java
@@ -660,6 +660,10 @@ public JSONObject getQueueStats()
             "rtp_sender_queue",
             getJsonFromQueueStatisticsAndErrorHandler(RtpSenderImpl.Companion.getQueueErrorCounter(),
                 "rtp-sender-incoming-packet-queue"));
+        queueStats.put(
+            "colibri_queue",
+            QueueStatistics.Companion.getStatistics().get("colibri-queue")
+        );
 
         queueStats.put(
             AbstractEndpointMessageTransport.INCOMING_MESSAGE_QUEUE_ID,

diff --git a/jvb/src/main/java/org/jitsi/videobridge/shim/ConferenceShim.java b/jvb/src/main/java/org/jitsi/videobridge/shim/ConferenceShim.java
@@ -72,9 +72,9 @@ public ConferenceShim(Conference conference, Logger parentLogger)
         this.logger = parentLogger.createChildLogger(ConferenceShim.class.getName());
         this.conference = conference;
         colibriQueue = new PacketQueue<>(
-                100,
+                Integer.MAX_VALUE,
                 true,
-                "colibri-queue-" + conference.getID(),
+                "colibri-queue",
                 request ->
                 {
                     try

diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
         <kotlin.version>1.5.20</kotlin.version>
         <kotest.version>4.6.1</kotest.version>
         <jicoco.version>1.1-90-gfa0e11e</jicoco.version>
-        <jitsi.utils.version>1.0-94-ge7c7a43</jitsi.utils.version>
+        <jitsi.utils.version>1.0-97-g67c980b</jitsi.utils.version>
         <maven-shade-plugin.version>3.2.2</maven-shade-plugin.version>
         <spotbugs.version>4.1.4</spotbugs.version>
         <jersey.version>2.34</jersey.version>