fix: Refresh the conference start timeout on a conference-request. (#1257)

Author: bgrozev

jicofo/src/main/java/org/jitsi/jicofo/conference/JitsiMeetConferenceImpl.java

@@ -183,6 +183,8 @@ public class JitsiMeetConferenceImpl
      */
     private Future<?> conferenceStartTimeout;
 
+    private final Object conferenceStartTimeoutLock = new Object();
+
     /**
      * Reconnect timer. Used to stop the conference if XMPP connection is not restored in a given time.
      */
@@ -304,7 +306,7 @@ public JitsiMeetConferenceImpl(
         this.jicofoServices = jicofoServices;
         this.jvbVersion = jvbVersion;
 
-        rescheduleConferenceStartTimeout();
+        scheduleConferenceStartTimeout();
 
         visitorCodecs = new PreferenceAggregator(
             logger,
@@ -784,11 +786,7 @@ private void onMemberJoined(@NotNull ChatRoomMember chatRoomMember)
 
         synchronized (participantLock)
         {
-            if (conferenceStartTimeout != null)
-            {
-                conferenceStartTimeout.cancel(true);
-                conferenceStartTimeout = null;
-            }
+            cancelConferenceStartTimeout();
             // Make sure it's still a member of the room.
             if (chatRoomMember.getChatRoom().getChatMember(chatRoomMember.getOccupantJid()) != chatRoomMember)
             {
@@ -1077,7 +1075,7 @@ else if (chatRoomMember != null
                     && BREAKOUT_SWITCHING_STATUS.equals(chatRoomMember.getPresence().getStatus()))
             {
                 logger.info("Member moving to breakout room, will not stop.");
-                rescheduleConferenceStartTimeout();
+                scheduleConferenceStartTimeout();
             }
             else
             {
@@ -2241,30 +2239,62 @@ private void rescheduleSingleParticipantTimeout()
         logger.info("Scheduled single person timeout.");
     }
 
+    private void cancelConferenceStartTimeout()
+    {
+        synchronized (conferenceStartTimeoutLock)
+        {
+            if (conferenceStartTimeout != null)
+            {
+                conferenceStartTimeout.cancel(true);
+                conferenceStartTimeout = null;
+            }
+        }
+    }
+
     /**
-     * (Re)schedules conference start timeout.
+     * If there is a scheduled "conference start" timeout, cancel it and re-schedule with the configured delay. If
+     * there isn't one scheduled, doesn't do anything.
      */
-    private void rescheduleConferenceStartTimeout()
+    public void rescheduleConferenceStartTimeout()
     {
-        conferenceStartTimeout = TaskPools.getScheduledPool().schedule(
-                () ->
-                {
-                    if (includeInStatistics)
-                    {
-                        logger.info("Expiring due to initial timeout.");
-                    }
+        synchronized (conferenceStartTimeoutLock)
+        {
+            if (conferenceStartTimeout != null)
+            {
+                cancelConferenceStartTimeout();
+                scheduleConferenceStartTimeout();
+            }
+        }
+    }
 
-                    // in case of last participant leaving to join a breakout room, we want to skip destroy
-                    if (jicofoServices.getFocusManager().hasBreakoutRooms(roomName))
+    /**
+     * Schedules conference start timeout.
+     */
+    private void scheduleConferenceStartTimeout()
+    {
+        synchronized (conferenceStartTimeoutLock)
+        {
+            cancelConferenceStartTimeout();
+            conferenceStartTimeout = TaskPools.getScheduledPool().schedule(
+                    () ->
                     {
-                        logger.info("Breakout rooms present, will not stop.");
-                        return;
-                    }
+                        if (includeInStatistics)
+                        {
+                            logger.info("Expiring due to initial timeout.");
+                        }
 
-                    stop();
-                },
-                ConferenceConfig.config.getConferenceStartTimeout().toMillis(),
-                TimeUnit.MILLISECONDS);
+                        // in case of last participant leaving to join a breakout room, we want to skip destroy
+                        if (jicofoServices.getFocusManager().hasBreakoutRooms(roomName))
+                        {
+                            logger.info("Breakout rooms present, will not stop.");
+                            return;
+                        }
+
+                        stop();
+                    },
+                    ConferenceConfig.config.getConferenceStartTimeout().toMillis(),
+                    TimeUnit.MILLISECONDS);
+        }
     }
 
     /** Called when a new visitor has been added to the conference. */

jicofo/src/main/kotlin/org/jitsi/jicofo/FocusManager.kt

@@ -103,6 +103,7 @@ class FocusManager(
             val existingConference = conferences[room]
             conference = existingConference ?: createConference(room, properties, loggingLevel, includeInStatistics)
             isConferenceCreator = existingConference == null
+            if (!isConferenceCreator) conference.rescheduleConferenceStartTimeout()
         }
         try {
             if (isConferenceCreator) {