diff --git a/ansible/roles/jicofo/defaults/main.yml b/ansible/roles/jicofo/defaults/main.yml index eb7f5d7a..9007067d 100644 --- a/ansible/roles/jicofo/defaults/main.yml +++ b/ansible/roles/jicofo/defaults/main.yml @@ -56,6 +56,12 @@ jicofo_jvb_brewery_muc: JvbBrewery@{{ jicofo_internal_muc_prefix }}.{{ environme jicofo_max_audio_senders: 999999 # Max participants in a single conference on a single bridge. jicofo_max_bridge_participants: 80 +# The interval for jicofo_max_bridge_participants_per_interval. +jicofo_max_bridge_participants_interval: 1 minute +# Max participants that a single conference may add to a single bridge within +# jicofo_max_bridge_participants_interval (-1 to disable). This limits the overshoot when a conference bursts, because +# the stress level reported by a bridge lags the actual load by 5-10 seconds. +jicofo_max_bridge_participants_per_interval: 30 jicofo_max_memory: "1536m" jicofo_max_video_senders: 999999 jicofo_prosody_jvb_hostname: "127.0.0.1" diff --git a/ansible/roles/jicofo/templates/jicofo.conf.j2 b/ansible/roles/jicofo/templates/jicofo.conf.j2 index 847917fa..a6f79033 100644 --- a/ansible/roles/jicofo/templates/jicofo.conf.j2 +++ b/ansible/roles/jicofo/templates/jicofo.conf.j2 @@ -32,6 +32,8 @@ jicofo { average-participant-stress = {{ jicofo_average_participant_stress }} stress-threshold = {{ jicofo_stress_threshold }} max-bridge-participants = {{ jicofo_max_bridge_participants }} + max-bridge-participants-per-interval = {{ jicofo_max_bridge_participants_per_interval }} + max-bridge-participants-interval = {{ jicofo_max_bridge_participants_interval }} # This duplicates oracle_to_aws_region_map and aws_to_oracle_region_map. # Once we're moved to oracle regions everywhere we should remove the extra mappings.