Compare commits

..

5 Commits

4 changed files with 44 additions and 10 deletions

View File

@ -57,16 +57,16 @@ matrix_synapse_rc_message:
burst_count: 25 burst_count: 25
## Synapse cache tuning ## Synapse cache tuning
matrix_synapse_caches_global_factor: 0.7 matrix_synapse_caches_global_factor: 1.5
matrix_synapse_event_cache_size: "200K" matrix_synapse_event_cache_size: "300K"
## Synapse workers ## Synapse workers
matrix_synapse_workers_enabled: true matrix_synapse_workers_enabled: true
matrix_synapse_workers_preset: "little-federation-helper" matrix_synapse_workers_preset: "little-federation-helper"
matrix_synapse_workers_generic_workers_count: 2 matrix_synapse_workers_generic_workers_count: 2
matrix_synapse_workers_media_repository_workers_count: 2 matrix_synapse_workers_media_repository_workers_count: 2
matrix_synapse_workers_federation_sender_workers_count: 1 matrix_synapse_workers_federation_sender_workers_count: 3
matrix_synapse_workers_pusher_workers_count: 0 matrix_synapse_workers_pusher_workers_count: 1
matrix_synapse_workers_appservice_workers_count: 1 matrix_synapse_workers_appservice_workers_count: 1
# Static secret auth for matrix-synapse-shared-secret-auth # Static secret auth for matrix-synapse-shared-secret-auth
@ -80,8 +80,27 @@ matrix_synapse_ext_password_provider_rest_auth_login_profile_name_autofill: fals
# Enable experimental spaces support # Enable experimental spaces support
matrix_synapse_configuration_extension_yaml: | matrix_synapse_configuration_extension_yaml: |
database:
args:
cp_max: 20
experimental_features: experimental_features:
spaces_enabled: true spaces_enabled: true
caches:
per_cache_factors:
device_id_exists: 3
get_users_in_room: 4
_get_joined_users_from_context: 4
_get_joined_profile_from_event_id: 3
"*stateGroupMembersCache*": 2
_matches_user_in_member_list: 3
get_users_who_share_room_with_user: 3
is_interested_in_room: 2
get_user_by_id: 1.5
room_push_rule_cache: 1.5
expire_caches: true
cache_entry_ttl: 45m
sync_response_cache_duration: 2m
# #
# synapse-admin tool # synapse-admin tool

View File

@ -20,7 +20,7 @@
with_items: with_items:
- "matrix_synapse_workers_appservice_workers_count" - "matrix_synapse_workers_appservice_workers_count"
- "matrix_synapse_workers_pusher_workers_count" - "matrix_synapse_workers_pusher_workers_count"
- "matrix_synapse_workers_federation_sender_workers_count" # - "matrix_synapse_workers_federation_sender_workers_count"
- name: (Deprecation) Catch and report renamed settings - name: (Deprecation) Catch and report renamed settings
fail: fail:

View File

@ -2848,7 +2848,9 @@ opentracing:
# Disables sending of outbound federation transactions on the main process. # Disables sending of outbound federation transactions on the main process.
# Uncomment if using a federation sender worker. # Uncomment if using a federation sender worker.
# #
#send_federation: false {% if matrix_synapse_workers_federation_sender_workers_count|int > 0 %}
send_federation: false
{% endif %}
# It is possible to run multiple federation sender workers, in which case the # It is possible to run multiple federation sender workers, in which case the
# work is balanced across them. # work is balanced across them.
@ -2858,8 +2860,13 @@ opentracing:
# started, to ensure that all instances are running with the same config (otherwise # started, to ensure that all instances are running with the same config (otherwise
# events may be dropped). # events may be dropped).
# #
#federation_sender_instances: {% if matrix_synapse_workers_federation_sender_workers_count != 0%}
# - federation_sender1 federation_sender_instances:
{% for i in range(0, matrix_synapse_workers_federation_sender_workers_count|int)|list %}
# -dd federation_sender1
- federation_sender:{{ i | int }}
{% endfor %}
{% endif %}
# When using workers this should be a map from `worker_name` to the # When using workers this should be a map from `worker_name` to the
# HTTP replication listener of the worker, if configured. # HTTP replication listener of the worker, if configured.

View File

@ -17,8 +17,16 @@ https://{{ matrix_server_fqn_matrix }} {
uri replace /metrics/synapse/worker/appservice /_synapse-worker-appservice-0/metrics uri replace /metrics/synapse/worker/appservice /_synapse-worker-appservice-0/metrics
reverse_proxy * http://{{ matrix_nginx_proxy_container_http_host_bind_port }} reverse_proxy * http://{{ matrix_nginx_proxy_container_http_host_bind_port }}
} }
route /metrics/synapse/worker/federation-sender { route /metrics/synapse/worker/federation-sender-0 {
uri replace /metrics/synapse/worker/federation-sender /_synapse-worker-federation_sender-0/metrics uri replace /metrics/synapse/worker/federation-sender-0 /_synapse-worker-federation_sender-0/metrics
reverse_proxy * http://{{ matrix_nginx_proxy_container_http_host_bind_port }}
}
route /metrics/synapse/worker/federation-sender-1 {
uri replace /metrics/synapse/worker/federation-sender-1 /_synapse-worker-federation_sender-1/metrics
reverse_proxy * http://{{ matrix_nginx_proxy_container_http_host_bind_port }}
}
route /metrics/synapse/worker/federation-sender-2 {
uri replace /metrics/synapse/worker/federation-sender-2 /_synapse-worker-federation_sender-2/metrics
reverse_proxy * http://{{ matrix_nginx_proxy_container_http_host_bind_port }} reverse_proxy * http://{{ matrix_nginx_proxy_container_http_host_bind_port }}
} }
route /metrics/synapse/worker/generic-0 { route /metrics/synapse/worker/generic-0 {