diff --git a/scripts-dev/get_sched_tasks.sql b/scripts-dev/get_sched_tasks.sql new file mode 100644 index 00000000000..680342cfa29 --- /dev/null +++ b/scripts-dev/get_sched_tasks.sql @@ -0,0 +1 @@ +select * from scheduled_tasks where status != 'complete'; diff --git a/synapse/config/ratelimiting.py b/synapse/config/ratelimiting.py index 78d9d61d3c6..42891e3e4c9 100644 --- a/synapse/config/ratelimiting.py +++ b/synapse/config/ratelimiting.py @@ -84,6 +84,7 @@ class RatelimitConfig(Config): section = "ratelimiting" def read_config(self, config: JsonDict, **kwargs: Any) -> None: + self.override_max_concurrent_running_tasks = config.get("ratelimiting", {}).get("override_max_concurrent_running_tasks", None) # Load the new-style messages config if it exists. Otherwise fall back # to the old method. if "rc_message" in config: diff --git a/synapse/util/task_scheduler.py b/synapse/util/task_scheduler.py index 3b4423a1ff5..2ea5558db31 100644 --- a/synapse/util/task_scheduler.py +++ b/synapse/util/task_scheduler.py @@ -139,6 +139,12 @@ def __init__(self, hs: "HomeServer"): hook=lambda: {(self.server_name,): len(self._running_tasks)}, ) + if hs.config.ratelimiting.override_max_concurrent_running_tasks is not None: + TaskScheduler.MAX_CONCURRENT_RUNNING_TASKS = ( + hs.config.ratelimiting.override_max_concurrent_running_tasks + ) + logger.warning("Max concurrent running tasks: %s, override: %s", TaskScheduler.MAX_CONCURRENT_RUNNING_TASKS, hs.config.ratelimiting.override_max_concurrent_running_tasks) + def register_action( self, function: Callable[