OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename function to add_worker_to_instance_map given reduction of scope

rei/cwas_extension
Olivier Wilkinson (reivilibre) 2023-11-16 15:49:20 +00:00
parent f38297b619
commit 7d8824e2dc
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docker/configure_workers_and_start.py
View File

@ -370,13 +370,13 @@ def convert(src: str, dst: str, **template_vars: object) -> None:
outfile.write(rendered) outfile.write(rendered)
def add_worker_roles_to_shared_config( def add_worker_to_instance_map(
shared_config: dict, shared_config: dict,
worker_name: str, worker_name: str,
worker_port: int, worker_port: int,
) -> None: ) -> None:
"""Given a dictionary representing a config file shared across all workers, """
append appropriate worker information to it for the current worker_type instance. Update the shared config map to add the worker in the instance_map.
Args: Args:
shared_config: The config dict that all worker instances share (after being shared_config: The config dict that all worker instances share (after being
@ -384,13 +384,8 @@ def add_worker_roles_to_shared_config(
worker_name: The name of the worker instance. worker_name: The name of the worker instance.
worker_port: The HTTP replication port that the worker instance is listening on. worker_port: The HTTP replication port that the worker instance is listening on.
""" """
# The instance_map config field marks the workers that write to various replication
# streams
instance_map = shared_config.setdefault("instance_map", {}) instance_map = shared_config.setdefault("instance_map", {})
# Add all workers to the `instance_map`
# Technically only certain types of workers, such as stream writers, are needed
# here but it is simpler just to be consistent.
if os.environ.get("SYNAPSE_USE_UNIX_SOCKET", False): if os.environ.get("SYNAPSE_USE_UNIX_SOCKET", False):
instance_map[worker_name] = { instance_map[worker_name] = {
"path": f"/run/worker.{worker_port}", "path": f"/run/worker.{worker_port}",
@ -808,8 +803,10 @@ def generate_worker_files(
else: else:
healthcheck_urls.append("http://localhost:%d/health" % (worker_port,)) healthcheck_urls.append("http://localhost:%d/health" % (worker_port,))
# Update the shared config with sharding-related options if necessary # Add all workers to the `instance_map`
add_worker_roles_to_shared_config(shared_config, worker_name, worker_port) # Technically only certain types of workers, such as stream writers, are needed
# here but it is simpler just to be consistent.
add_worker_to_instance_map(shared_config, worker_name, worker_port)
# Enable the worker in supervisord # Enable the worker in supervisord
worker_descriptors.append(worker_config) worker_descriptors.append(worker_config)