fixup! fixup! fixup! fixup! fixup! queue_job: wip hot reload of channel managers by DB

Author: guewen

queue_job/jobrunner/runner.py

@@ -80,7 +80,7 @@ def _root_capacity_from_channels_config(config_string):
     return 1
 
 
-def _max_capacity(channel_config_string: str | None = None) -> int:
+def _max_capacity() -> int:
     """Maximum number of jobs running at the same time across all databases
 
     If a channels server-side configuration exists, it is equivalent to the
@@ -93,9 +93,7 @@ def _max_capacity(channel_config_string: str | None = None) -> int:
     If none is configured, the max capacity is 0.
     """
     if _server_side_channels_configured():
-        if channel_config_string is None:
-            channel_config_string = _channels()
-        return _root_capacity_from_channels_config(channel_config_string)
+        return _root_capacity_from_channels_config(_channels())
 
     value = os.environ.get("ODOO_QUEUE_JOB_MAX_CAPACITY") or queue_job_config.get(
         "max_capacity"

queue_job/tests/test_runner_runner.py

@@ -2,6 +2,7 @@
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)
 import doctest
 import os
+from unittest import mock
 
 from odoo.tests import BaseCase, tagged
 
@@ -61,3 +62,53 @@ def test_runner_file_closed_write_descriptor(self):
 
         self.assertFalse(self._is_open_file_descriptor(read_fd))
         self.assertFalse(self._is_open_file_descriptor(write_fd))
+
+    def test_max_capacity_from_env_channels(self):
+        with (
+            mock.patch.dict(
+                os.environ, {"ODOO_QUEUE_JOB_CHANNELS": "root:7,sub:2"}, clear=True
+            ),
+            mock.patch.object(runner, "queue_job_config", {}),
+        ):
+            self.assertEqual(runner._max_capacity(), 7)
+
+    def test_max_capacity_from_env_channels_without_root(self):
+        with (
+            mock.patch.dict(
+                os.environ, {"ODOO_QUEUE_JOB_CHANNELS": "sub:2"}, clear=True
+            ),
+            mock.patch.object(runner, "queue_job_config", {}),
+        ):
+            self.assertEqual(runner._max_capacity(), 1)
+
+    def test_max_capacity_from_env(self):
+        with (
+            mock.patch.dict(
+                os.environ, {"ODOO_QUEUE_JOB_MAX_CAPACITY": "5"}, clear=True
+            ),
+            mock.patch.object(runner, "queue_job_config", {}),
+        ):
+            self.assertEqual(runner._max_capacity(), 5)
+
+    def test_max_capacity_from_odoo_config(self):
+        with (
+            mock.patch.dict(os.environ, {}, clear=True),
+            mock.patch.object(runner, "queue_job_config", {"max_capacity": "3"}),
+        ):
+            self.assertEqual(runner._max_capacity(), 3)
+
+    def test_max_capacity_env_priority_over_odoo_config(self):
+        with (
+            mock.patch.dict(
+                os.environ, {"ODOO_QUEUE_JOB_MAX_CAPACITY": "5"}, clear=True
+            ),
+            mock.patch.object(runner, "queue_job_config", {"max_capacity": "3"}),
+        ):
+            self.assertEqual(runner._max_capacity(), 5)
+
+    def test_max_capacity_default(self):
+        with (
+            mock.patch.dict(os.environ, {}, clear=True),
+            mock.patch.object(runner, "queue_job_config", {}),
+        ):
+            self.assertEqual(runner._max_capacity(), 0)