Maintainers
+Maintainers
This module is maintained by the OCA.
@@ -475,5 +480,6 @@ 
| Job Queue
-[queue_job_batch](queue_job_batch/) | 18.0.1.0.0 | | Job Queue Batch
+[queue_job](queue_job/) | 18.0.4.0.0 | | Job Queue
+[queue_job_batch](queue_job_batch/) | 18.0.1.1.1 | | Job Queue Batch
[queue_job_cron](queue_job_cron/) | 18.0.1.1.1 | | Scheduled Actions as Queue Jobs
[queue_job_cron_jobrunner](queue_job_cron_jobrunner/) | 18.0.1.0.1 | 
| Run jobs without a dedicated JobRunner
+[queue_job_profiler](queue_job_profiler/) | 18.0.1.0.1 | 
| Job Queue Profiler
[queue_job_subscribe](queue_job_subscribe/) | 18.0.1.0.0 | | Control which users are subscribed to queue job notifications
-[test_queue_job](test_queue_job/) | 18.0.2.0.5 | | Queue Job Tests
+[test_queue_job](test_queue_job/) | 18.0.2.1.0 | | Queue Job Tests
[test_queue_job_batch](test_queue_job_batch/) | 18.0.1.0.0 | | Test Job Queue Batch
[//]: # (end addons)
diff --git a/checklog-odoo.cfg b/checklog-odoo.cfg
index 0b55b7bf66..58d43aa666 100644
--- a/checklog-odoo.cfg
+++ b/checklog-odoo.cfg
@@ -1,3 +1,5 @@
[checklog-odoo]
ignore=
WARNING.* 0 failed, 0 error\(s\).*
+ WARNING .* Killing chrome descendants-or-self .*
+ WARNING.* Missing widget: res_partner_many2one for field of type many2one.*
diff --git a/eslint.config.cjs b/eslint.config.cjs
index 0d5731f89a..dd0cbe0aef 100644
--- a/eslint.config.cjs
+++ b/eslint.config.cjs
@@ -1,3 +1,4 @@
+var globals = require('globals');
jsdoc = require("eslint-plugin-jsdoc");
const config = [{
@@ -16,6 +17,8 @@ const config = [{
openerp: "readonly",
owl: "readonly",
luxon: "readonly",
+ QUnit: "readonly",
+ ...globals.browser,
},
ecmaVersion: 2024,
@@ -191,7 +194,7 @@ const config = [{
},
}, {
- files: ["**/*.esm.js"],
+ files: ["**/*.esm.js", "**/*test.js"],
languageOptions: {
ecmaVersion: 2024,
diff --git a/queue_job/README.rst b/queue_job/README.rst
index cfe02b7d37..f532b5ad4f 100644
--- a/queue_job/README.rst
+++ b/queue_job/README.rst
@@ -11,7 +11,7 @@ Job Queue
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- !! source digest: sha256:a5cdcff42c2f45fbb57753e7693373b08e3497d0bc07212dac0f3ab56217eaf2
+ !! source digest: sha256:3b16bf21213fd89fc480b21d848a287bc462883118d3e2e1a4ce7ed72d861bed
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png
@@ -123,22 +123,100 @@ Be sure to have the ``requests`` library.
Configuration
=============
-- Using environment variables and command line:
+There are two ways to configure the job runner:
+
+Set ``channels`` (or ``ODOO_QUEUE_JOB_CHANNELS``) and every database
+shares the same channel tree (we will call it server-wide channels):
+
+.. code:: ini
+
+ [queue_job]
+ channels = root:10,root.priority:3,root.slow:1
+
+Leave ``channels`` unset and set ``max_capacity`` instead. The job
+runner then builds a separate channel tree for each database, based on
+the *Job Channels* configured on each database (we will call it
+per-database channels).
+
+.. code:: ini
+
+ [queue_job]
+ max_capacity = 10
+
+``channels`` always has precedence over ``max_capacity``. If
+``channels`` is set, the per-database configuration is not used. If
+neither ``channels`` nor ``max_capacity`` are set, the default execution
+mode is per-database channels with a ``max_capacity`` of 1.
+
+In the per-database mode, channels are configured from the *Job
+Channels* menu (or by XML data, see the Usage) instead of a global
+configuration string.
+
+Alongside ``max_capacity``, a global configuration ``db_max_capacity``
+can be set. It represents the max number of jobs executed at the same
+time for a single database (capped by the ``max_capacity`` anyway):
+
+.. code:: ini
+
+ [queue_job]
+ max_capacity = 10
+ db_max_capacity = 3 # no more than 3 simultaneous jobs per database
+
+``db_max_capacity`` may be an integer or a pattern such as
+``prod_*:20,staging:2,*:5``, where the first match wins. When using a
+pattern, unmatched databases can be configured by a global pattern at
+the end (``*:n``), otherwise they will use the ``max_capacity``.
+
+The root channel capacity of a database can still be set independently,
+however, will in any case be capped by the global ``max_capacity`` and
+``db_max_capacity`` parameters.
+
+When set to 0, ``max_capacity`` or ``db_max_capacity`` means there is no
+jobs executed.
+
+Editing a channel's capacity, sequential flag, throttle or set it to
+pause from the *Job Channels* menu **is applied live on the job
+runner**.
+
+.. note::
+
+ A new database still needs the jobrunner to be restarted.
+
+When using the server-wide channels, the configuration is static and
+loaded at startup of the jobrunner.
+
+The execution of channels by the job runner is defined by:
+
+- ``capacity``: max number of jobs running at once in the channel (``0``
+ means no limit of its own, the parent channel and ``max_capacity`` or
+ ``db_max_capacity`` still apply)
+- ``sequential``: jobs run one after the other, and a failed job blocks
+ the channel (requires a capacity of 1)
+- ``throttle``: minimum delay, in seconds, between the start of two jobs
+- ``paused``: stop running jobs in this channel and its sub-channels
+
+**Job Runner Configuration Parameters**
+
+- Using environment variables:
- Adjust environment variables (optional):
- - ``ODOO_QUEUE_JOB_CHANNELS=root:4`` or any other channels
- configuration. The default is ``root:1``
+ - ``ODOO_QUEUE_JOB_CHANNELS=root:4`` or any other channels for
+ server-wide channels
+ - ``ODOO_QUEUE_JOB_MAX_CAPACITY=4``, max number of concurrent jobs
+ (not used if ``ODOO_QUEUE_JOB_CHANNELS`` is set) for per-database
+ channels
+ - ``ODOO_QUEUE_JOB_DB_MAX_CAPACITY=2``, max number of concurrent
+ jobs per DB (not used if ``ODOO_QUEUE_JOB_CHANNELS`` is set)
- ``ODOO_QUEUE_JOB_PORT=8069``, default ``--http-port``
- ``ODOO_QUEUE_JOB_SCHEME=https``, default ``http``
- ``ODOO_QUEUE_JOB_HOST=load-balancer``, default
``--http-interface`` or ``localhost`` if unset
- ``ODOO_QUEUE_JOB_HTTP_AUTH_USER=jobrunner``, default empty
- ``ODOO_QUEUE_JOB_HTTP_AUTH_PASSWORD=s3cr3t``, default empty
- - Start Odoo with ``--load=web,queue_job`` and ``--workers`` greater
- than 1. [1]_
-- Using the Odoo configuration file:
+- Using the Odoo configuration file (set either ``channels``, either
+ ``max_capacity`` and/or ``db_max_capacity``)
.. code:: ini
@@ -150,12 +228,26 @@ Configuration
(...)
[queue_job]
channels = root:2
+ max_capacity = 8
+ db_max_capacity = 3
scheme = https
host = load-balancer
port = 443
http_auth_user = jobrunner
http_auth_password = s3cr3t
+- Odoo has to be started with ``queue_job`` as server-wide module,
+ either using the command line option ``--load=web,queue_job``, either
+ by setting it in the Odoo configuration file, and ``--workers``
+ greater than 1. [1]_
+
+.. code:: ini
+
+ [options]
+ (...)
+ workers = 6
+ server_wide_modules = web,queue_job
+
- Confirm the runner is starting correctly by checking the odoo log
file:
@@ -166,14 +258,25 @@ Configuration
...INFO...queue_job.jobrunner.runner: queue job runner ready for db 
This addon adds an integrated Job Queue to Odoo.
@@ -484,24 +484,87 @@There are two ways to configure the job runner:
+Set channels (or ODOO_QUEUE_JOB_CHANNELS) and every database +shares the same channel tree (we will call it server-wide channels):
++[queue_job] +channels = root:10,root.priority:3,root.slow:1 ++
Leave channels unset and set max_capacity instead. The job +runner then builds a separate channel tree for each database, based on +the Job Channels configured on each database (we will call it +per-database channels).
++[queue_job] +max_capacity = 10 ++
channels always has precedence over max_capacity. If +channels is set, the per-database configuration is not used. If +neither channels nor max_capacity are set, the default execution +mode is per-database channels with a max_capacity of 1.
+In the per-database mode, channels are configured from the Job +Channels menu (or by XML data, see the Usage) instead of a global +configuration string.
+Alongside max_capacity, a global configuration db_max_capacity +can be set. It represents the max number of jobs executed at the same +time for a single database (capped by the max_capacity anyway):
++[queue_job] +max_capacity = 10 +db_max_capacity = 3 # no more than 3 simultaneous jobs per database ++
db_max_capacity may be an integer or a pattern such as +prod_*:20,staging:2,*:5, where the first match wins. When using a +pattern, unmatched databases can be configured by a global pattern at +the end (*:n), otherwise they will use the max_capacity.
+The root channel capacity of a database can still be set independently, +however, will in any case be capped by the global max_capacity and +db_max_capacity parameters.
+When set to 0, max_capacity or db_max_capacity means there is no +jobs executed.
+Editing a channel’s capacity, sequential flag, throttle or set it to +pause from the Job Channels menu is applied live on the job +runner.
+Note
+A new database still needs the jobrunner to be restarted.
+When using the server-wide channels, the configuration is static and +loaded at startup of the jobrunner.
+The execution of channels by the job runner is defined by:
+Job Runner Configuration Parameters
[options] @@ -512,6 +575,8 @@Configuration
(...) [queue_job] channels = root:2 +max_capacity = 8 +db_max_capacity = 3 scheme = https host = load-balancer port = 443 @@ -519,6 +584,18 @@Configuration
http_auth_password = s3cr3t
+[options] +(...) +workers = 6 +server_wide_modules = web,queue_job ++
Migrating from server-wide channels to per-database channels
+As long as channels (or ODOO_QUEUE_JOB_CHANNELS) is set, the job +runner keeps using the server-wide channels.
+To move to channels per database:
+