kaslo/synapse
1
0
Fork 0
Code Wiki Activity

Move final creation of a worker name to after the final check of why it can't exist.

Browse Source
This commit is contained in:
Jason Little
2023-03-09 04:54:03 -06:00
parent e2fecab988
commit 97a0af000e
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/configure_workers_and_start.py
+9 -9
View File
@@ -714,14 +714,6 @@ def parse_worker_types(
# worker_base_name and
# worker_types_set which is a Set of what worker_types are requested
# This counter is used for naming workers with an incrementing number. Use the
# worker_base_name for the index
worker_type_counter[worker_base_name] += 1
# Name workers by their type or requested name concatenated with an
# incrementing number. e.g. federation_reader1 or event_creator+event_persister1
worker_name = worker_base_name + str(worker_type_counter[worker_base_name])
# Now that the worker name is settled, check this worker_base_name isn't used
# for a different worker_type. Make sure the worker types being checked are
# deterministic.
@@ -740,7 +732,7 @@ def parse_worker_types(
else:
error(
f"Can not use worker_name: '{worker_name}' for worker_type(s): "
f"Can not use worker_name: '{worker_base_name}' for worker_type(s): "
f"'{deterministic_worker_type_string}'. It is already in use by "
f"worker_type(s): '{check_worker_type}'"
)
@@ -757,6 +749,14 @@ def parse_worker_types(
# Not in shard counter, must not have seen it yet, add it.
worker_type_shard_counter[worker_type] += 1
# This counter is used for naming workers with an incrementing number. Use the
# worker_base_name for the index
worker_type_counter[worker_base_name] += 1
# Name workers by their type or requested name concatenated with an
# incrementing number. e.g. federation_reader1 or event_creator+event_persister1
worker_name = worker_base_name + str(worker_type_counter[worker_base_name])
# The worker has survived the gauntlet of why it can't exist. Add it to the pile
dict_to_return.setdefault(worker_name, {}).setdefault(
"worker_base_name", worker_base_name