Browse Source

feat(jicofo): ice failure parameters (#2084)

* feat(jicofo): ice failure parameters

* include restart request controls
Aaron van Meerten 1 week ago
parent
commit
7e76486afc
2 changed files with 18 additions and 0 deletions
  1. 5 0
      docker-compose.yml
  2. 13 0
      jicofo/rootfs/defaults/jicofo.conf

+ 5 - 0
docker-compose.yml

@@ -389,9 +389,14 @@ services:
             - JICOFO_ENABLE_LOAD_REDISTRIBUTION
             - JICOFO_ENABLE_REST
             - JICOFO_HEALTH_CHECKS_USE_PRESENCE
+            - JICOFO_ICE_FAILURE_INTERVAL
+            - JICOFO_ICE_FAILURE_MIN_ENDPOINTS
+            - JICOFO_ICE_FAILURE_THRESHOLD
             - JICOFO_MAX_MEMORY
             - JICOFO_MULTI_STREAM_BACKWARD_COMPAT
             - JICOFO_OCTO_REGION
+            - JICOFO_RESTART_REQUEST_MAX
+            - JICOFO_RESTART_REQUEST_INTERVAL
             - JICOFO_TRUSTED_DOMAINS
             - JIBRI_BREWERY_MUC
             - JIBRI_REQUEST_RETRIES

+ 13 - 0
jicofo/rootfs/defaults/jicofo.conf

@@ -14,6 +14,9 @@
 {{ $ENABLE_JVB_XMPP_SERVER := .Env.ENABLE_JVB_XMPP_SERVER | default "0" | toBool -}}
 {{ $ENABLE_SHARED_DOCUMENT_RANDOM_NAME := .Env.ENABLE_SHARED_DOCUMENT_RANDOM_NAME | default "0" | toBool -}}
 {{ $HEALTH_CHECKS_USE_PRESENCE := .Env.JICOFO_HEALTH_CHECKS_USE_PRESENCE | default "0" | toBool -}}
+{{ $ICE_FAILURE_INTERVAL := .Env.JICOFO_ICE_FAILURE_INTERVAL | default "60" -}}
+{{ $ICE_FAILURE_MIN_ENDPOINTS := .Env.JICOFO_ICE_FAILURE_MIN_ENDPOINTS | default "40" -}}
+{{ $ICE_FAILURE_THRESHOLD := .Env.JICOFO_ICE_FAILURE_THRESHOLD | default "0.1" -}}
 {{ $JIBRI_BREWERY_MUC := .Env.JIBRI_BREWERY_MUC | default "jibribrewery" -}}
 {{ $JIGASI_BREWERY_MUC := .Env.JIGASI_BREWERY_MUC | default "jigasibrewery" -}}
 {{ $JVB_BREWERY_MUC := .Env.JVB_BREWERY_MUC | default "jvbbrewery" -}}
@@ -22,6 +25,7 @@
 {{ $JVB_XMPP_INTERNAL_MUC_DOMAIN := .Env.JVB_XMPP_INTERNAL_MUC_DOMAIN | default "muc.jvb.meet.jitsi" -}}
 {{ $JVB_XMPP_PORT := .Env.JVB_XMPP_PORT | default "6222" -}}
 {{ $JVB_XMPP_SERVER := .Env.JVB_XMPP_SERVER | default "xmpp.jvb.meet.jitsi" -}}
+{{ $RESTART_REQUEST_INTERVAL := .Env.JICOFO_RESTART_REQUEST_INTERVAL | default "60" -}}
 {{ $VISITORS_MAX_VISITORS_PER_NODE := .Env.VISITORS_MAX_VISITORS_PER_NODE | default "250" }}
 {{ $VISITORS_MUC_PREFIX := .Env.PROSODY_VISITORS_MUC_PREFIX | default "muc" -}}
 {{ $VISITORS_REQUIRE_MUC_CONFIG := .Env.JICOFO_VISITORS_REQUIRE_MUC_CONFIG | default "0" | toBool }}
@@ -96,6 +100,9 @@ jicofo {
       {{ if .Env.JICOFO_ENABLE_ICE_FAILURE_DETECTION }}
       ice-failure-detection {
         enabled = {{ .Env.JICOFO_ENABLE_ICE_FAILURE_DETECTION | toBool }}
+        interval = {{ $ICE_FAILURE_INTERVAL }} seconds
+        min-endpoints = {{ $ICE_FAILURE_MIN_ENDPOINTS }}
+        threshold = {{ $ICE_FAILURE_THRESHOLD }}
       }
       {{ end }}
       {{ if .Env.JICOFO_ENABLE_LOAD_REDISTRIBUTION }}
@@ -205,6 +212,12 @@ jicofo {
       }
       {{ end }}
 
+      {{ if .Env.JICOFO_RESTART_REQUEST_MAX }}
+      restart-request-rate-limits {
+        max-requests = {{ .Env.JICOFO_RESTART_REQUEST_MAX }}
+        interval = {{ $RESTART_REQUEST_INTERVAL }} seconds
+      }
+      {{ end }}
     }
 
     {{ if .Env.JICOFO_ENABLE_HEALTH_CHECKS }}