diff --git a/README.md b/README.md index 9614ddff71..b3d7e77e27 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ addon | version | maintainers | summary [queue_job_batch](queue_job_batch/) | 14.0.1.0.0 | | Job Queue Batch [queue_job_context](queue_job_context/) | 14.0.1.0.1 | [![AshishHirapara](https://github.com/AshishHirapara.png?size=30px)](https://github.com/AshishHirapara) | Queue Job, prepare context before enqueue keys [queue_job_cron](queue_job_cron/) | 14.0.1.1.0 | | Scheduled Actions as Queue Jobs +[queue_job_cron_jobrunner](queue_job_cron_jobrunner/) | 14.0.1.0.0 | | Run jobs without a dedicated JobRunner [queue_job_subscribe](queue_job_subscribe/) | 14.0.1.0.0 | | Control which users are subscribed to queue job notifications [test_base_import_async](test_base_import_async/) | 14.0.1.0.1 | | Test suite for base_import_async. Normally you don't need to install this. [test_queue_job](test_queue_job/) | 14.0.3.0.1 | | Queue Job Tests diff --git a/queue_job_cron_jobrunner/README.rst b/queue_job_cron_jobrunner/README.rst new file mode 100644 index 0000000000..26fd243a6d --- /dev/null +++ b/queue_job_cron_jobrunner/README.rst @@ -0,0 +1,137 @@ +======================== +Queue Job Cron Jobrunner +======================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png + :target: https://odoo-community.org/page/development-status + :alt: Alpha +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fqueue-lightgray.png?logo=github + :target: https://github.com/OCA/queue/tree/14.0/queue_job_cron_jobrunner + :alt: OCA/queue +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/queue-14-0/queue-14-0-queue_job_cron_jobrunner + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/230/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module implements a simple ``queue.job`` runner using ``ir.cron`` triggers. + +It's meant to be used on environments where the regular job runner can't be run, like +on Odoo.sh. + +Unlike the regular job runner, where jobs are dispatched to the HttpWorkers, jobs are +processed on the CronWorker threads by the job runner crons. This is a design decision +because: + +* Odoo.sh puts HttpWorkers to sleep when there's no network activity +* HttpWorkers are meant for traffic. Users shouldn't pay the price of background tasks. + +For now, it only implements the most basic features of the ``queue_job`` runner, notably +no channel capacity nor priorities. Please check the ROADMAP for further details. + +.. IMPORTANT:: + This is an alpha version, the data model and design can change at any time without warning. + Only for development or testing purpose, do not use in production. + `More details on development status `_ + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +.. warning:: + + Don't use this module if you're already running the regular ``queue_job`` runner. + + +For the easiest case, no configuration is required besides installing the module. + +To avoid CronWorker CPU timeout from abruptly stopping the job processing cron, it's +recommended to launch Odoo with ``--limit-time-real-cron=0``, to disable the CronWorker +timeout altogether. + +.. note:: + + In Odoo.sh, this is done by default. + + +Parallel execution of jobs can be achieved by leveraging multiple ``ir.cron`` records: + +* Make sure you have enough CronWorkers available (Odoo CLI ``--max-cron-threads``) +* Duplicate the ``queue_job_cron`` cron record as many times as needed, until you have + as much records as cron workers. + +Known issues / Roadmap +====================== + +* Support channel capacity and priority. (See ``_acquire_one_job``) +* Gracefully handle CronWorker CPU timeouts. (See ``_job_runner``) +* Commit transaction after job state updated to started. (See ``_process``) + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Camptocamp SA + +Contributors +~~~~~~~~~~~~ + +* `Camptocamp `_ + + * Iván Todorovich + +* `codeforward B.V. `_ + + * Chris Bergman + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +.. |maintainer-ivantodorovich| image:: https://github.com/ivantodorovich.png?size=40px + :target: https://github.com/ivantodorovich + :alt: ivantodorovich + +Current `maintainer `__: + +|maintainer-ivantodorovich| + +This module is part of the `OCA/queue `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/queue_job_cron_jobrunner/__init__.py b/queue_job_cron_jobrunner/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/queue_job_cron_jobrunner/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/queue_job_cron_jobrunner/__manifest__.py b/queue_job_cron_jobrunner/__manifest__.py new file mode 100644 index 0000000000..4891883594 --- /dev/null +++ b/queue_job_cron_jobrunner/__manifest__.py @@ -0,0 +1,16 @@ +{ + "name": "Queue Job Cron Jobrunner", + "summary": "Run jobs without a dedicated JobRunner", + "version": "14.0.1.0.1", + "development_status": "Alpha", + "author": "Camptocamp SA, Odoo Community Association (OCA)", + "maintainers": ["ivantodorovich"], + "website": "https://github.com/OCA/queue", + "license": "AGPL-3", + "category": "Others", + "depends": ["queue_job"], + "data": [ + "data/ir_cron.xml", + "views/ir_cron.xml", + ], +} diff --git a/queue_job_cron_jobrunner/data/ir_cron.xml b/queue_job_cron_jobrunner/data/ir_cron.xml new file mode 100644 index 0000000000..5cb7436dcc --- /dev/null +++ b/queue_job_cron_jobrunner/data/ir_cron.xml @@ -0,0 +1,16 @@ + + + + + Queue Job Runner + + code + model._job_runner() + + + 1 + days + -1 + + + diff --git a/queue_job_cron_jobrunner/i18n/queue_job_cron_jobrunner.pot b/queue_job_cron_jobrunner/i18n/queue_job_cron_jobrunner.pot new file mode 100644 index 0000000000..d81b10a5bd --- /dev/null +++ b/queue_job_cron_jobrunner/i18n/queue_job_cron_jobrunner.pot @@ -0,0 +1,43 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * queue_job_cron_jobrunner +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 15.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: queue_job_cron_jobrunner +#: model:ir.model.fields,help:queue_job_cron_jobrunner.field_ir_cron__queue_job_runner +msgid "If checked, the cron is considered to be a queue.job runner." +msgstr "" + +#. module: queue_job_cron_jobrunner +#: code:addons/queue_job_cron_jobrunner/models/queue_job.py:0 +#, python-format +msgid "Job interrupted and set to Done: nothing to do." +msgstr "" + +#. module: queue_job_cron_jobrunner +#: model:ir.model,name:queue_job_cron_jobrunner.model_queue_job +msgid "Queue Job" +msgstr "" + +#. module: queue_job_cron_jobrunner +#: model:ir.actions.server,name:queue_job_cron_jobrunner.queue_job_cron_ir_actions_server +#: model:ir.cron,cron_name:queue_job_cron_jobrunner.queue_job_cron +#: model:ir.cron,name:queue_job_cron_jobrunner.queue_job_cron +#: model:ir.model.fields,field_description:queue_job_cron_jobrunner.field_ir_cron__queue_job_runner +msgid "Queue Job Runner" +msgstr "" + +#. module: queue_job_cron_jobrunner +#: model:ir.model,name:queue_job_cron_jobrunner.model_ir_cron +msgid "Scheduled Actions" +msgstr "" diff --git a/queue_job_cron_jobrunner/models/__init__.py b/queue_job_cron_jobrunner/models/__init__.py new file mode 100644 index 0000000000..4ba9dd1a16 --- /dev/null +++ b/queue_job_cron_jobrunner/models/__init__.py @@ -0,0 +1,2 @@ +from . import ir_cron +from . import queue_job diff --git a/queue_job_cron_jobrunner/models/ir_cron.py b/queue_job_cron_jobrunner/models/ir_cron.py new file mode 100644 index 0000000000..61235dc45a --- /dev/null +++ b/queue_job_cron_jobrunner/models/ir_cron.py @@ -0,0 +1,13 @@ +# Copyright 2022 Camptocamp SA (https://www.camptocamp.com). +# @author Iván Todorovich +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class IrCron(models.Model): + _inherit = "ir.cron" + + queue_job_runner = fields.Boolean( + help="If checked, the cron is considered to be a queue.job runner.", + ) diff --git a/queue_job_cron_jobrunner/models/queue_job.py b/queue_job_cron_jobrunner/models/queue_job.py new file mode 100644 index 0000000000..ba5825410e --- /dev/null +++ b/queue_job_cron_jobrunner/models/queue_job.py @@ -0,0 +1,181 @@ +# Copyright 2022 Camptocamp SA (https://www.camptocamp.com). +# @author Iván Todorovich +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +import logging +import traceback +from datetime import datetime +from io import StringIO + +from psycopg2 import OperationalError + +from odoo import _, api, fields, models, tools +from odoo.service.model import PG_CONCURRENCY_ERRORS_TO_RETRY + +from odoo.addons.queue_job.controllers.main import PG_RETRY +from odoo.addons.queue_job.exception import ( + FailedJobError, + NothingToDoJob, + RetryableJobError, +) +from odoo.addons.queue_job.job import Job + +_logger = logging.getLogger(__name__) + + +class QueueJob(models.Model): + _inherit = "queue.job" + + @api.model + def _acquire_one_job(self): + """Acquire the next job to be run. + + :returns: queue.job record (locked for update) + """ + # TODO: This method should respect channel priority and capacity, + # rather than just fetching them by creation date. + self.flush() + self.env.cr.execute( + """ + SELECT id + FROM queue_job + WHERE state = 'pending' + AND (eta IS NULL OR eta <= (now() AT TIME ZONE 'UTC')) + ORDER BY date_created DESC + LIMIT 1 FOR NO KEY UPDATE SKIP LOCKED + """ + ) + row = self.env.cr.fetchone() + return self.browse(row and row[0]) + + def _process(self, commit=False): + """Process the job""" + self.ensure_one() + job = Job._load_from_db_record(self) + # Set it as started + job.set_started() + job.store() + _logger.debug("%s started", job.uuid) + # TODO: Commit the state change so that the state can be read from the UI + # while the job is processing. However, doing this will release the + # lock on the db, so we need to find another way. + # if commit: + # self.flush() + # self.env.cr.commit() + + # Actual processing + try: + try: + with self.env.cr.savepoint(): + job.perform() + job.set_done() + job.store() + except OperationalError as err: + # Automatically retry the typical transaction serialization errors + if err.pgcode not in PG_CONCURRENCY_ERRORS_TO_RETRY: + raise + message = tools.ustr(err.pgerror, errors="replace") + job.postpone(result=message, seconds=PG_RETRY) + job.set_pending(reset_retry=False) + job.store() + _logger.debug("%s OperationalError, postponed", job) + + except NothingToDoJob as err: + if str(err): + msg = str(err) + else: + msg = _("Job interrupted and set to Done: nothing to do.") + job.set_done(msg) + job.store() + + except RetryableJobError as err: + # delay the job later, requeue + job.postpone(result=str(err), seconds=5) + job.set_pending(reset_retry=False) + job.store() + _logger.debug("%s postponed", job) + + except (FailedJobError, Exception): + with StringIO() as buff: + traceback.print_exc(file=buff) + _logger.error(buff.getvalue()) + job.set_failed(exc_info=buff.getvalue()) + job.store() + + if commit: # pragma: no cover + self.env["base"].flush() + self.env.cr.commit() # pylint: disable=invalid-commit + + _logger.debug("%s enqueue depends started", job) + job.enqueue_waiting() + _logger.debug("%s enqueue depends done", job) + + @api.model + def _job_runner(self, commit=True): + """Short-lived job runner, triggered by async crons""" + job = self._acquire_one_job() + while job: + job._process(commit=commit) + job = self._acquire_one_job() + # TODO: If limit_time_real_cron is reached before all the jobs are done, + # the worker will be killed abruptly. + # Ideally, find a way to know if we're close to reaching this limit, + # stop processing, and trigger a new execution to continue. + # + # if job and limit_time_real_cron_reached_or_about_to_reach: + # self._cron_trigger() + # break + + @api.model + def _cron_trigger(self, at=None): + """Trigger the cron job runners + + Odoo will prevent concurrent cron jobs from running. + So, to support parallel execution, we'd need to have (at least) the + same number of ir.crons records as cron workers. + + All crons should be triggered at the same time. + """ + if at is not None: + if isinstance(at, list) and not all([isinstance(x, datetime) for x in at]): + raise TypeError(f"Invalid parameter 'at': {str(at)}") + elif not isinstance(at, list) and not isinstance(at, datetime): + raise TypeError(f"Invalid parameter 'at': {str(at)}") + crons = self.env["ir.cron"].sudo().search([("queue_job_runner", "=", True)]) + nextcall = fields.Datetime.now() + if at is not None: + if isinstance(at, list) and len(at): + nextcall = sorted(at).pop() + elif isinstance(at, datetime): + nextcall = at + for cron in crons: + if nextcall < cron.nextcall: + cron.nextcall = nextcall + + def _ensure_cron_trigger(self): + """Create cron triggers for these jobs""" + records = self.filtered(lambda r: r.state == "pending") + if not records: + return + # Trigger immediate runs + immediate = any(not rec.eta for rec in records) + if immediate: + self._cron_trigger() + # Trigger delayed eta runs + delayed_etas = {rec.eta for rec in records if rec.eta} + if delayed_etas: + self._cron_trigger(at=list(delayed_etas)) + + @api.model_create_multi + def create(self, vals_list): + # When jobs are created, also create the cron trigger + records = super().create(vals_list) + records._ensure_cron_trigger() + return records + + def write(self, vals): + # When a job state or eta changes, make sure a cron trigger is created + res = super().write(vals) + if "state" in vals or "eta" in vals: + self._ensure_cron_trigger() + return res diff --git a/queue_job_cron_jobrunner/readme/CONFIGURE.rst b/queue_job_cron_jobrunner/readme/CONFIGURE.rst new file mode 100644 index 0000000000..0de15596d2 --- /dev/null +++ b/queue_job_cron_jobrunner/readme/CONFIGURE.rst @@ -0,0 +1,21 @@ +.. warning:: + + Don't use this module if you're already running the regular ``queue_job`` runner. + + +For the easiest case, no configuration is required besides installing the module. + +To avoid CronWorker CPU timeout from abruptly stopping the job processing cron, it's +recommended to launch Odoo with ``--limit-time-real-cron=0``, to disable the CronWorker +timeout altogether. + +.. note:: + + In Odoo.sh, this is done by default. + + +Parallel execution of jobs can be achieved by leveraging multiple ``ir.cron`` records: + +* Make sure you have enough CronWorkers available (Odoo CLI ``--max-cron-threads``) +* Duplicate the ``queue_job_cron`` cron record as many times as needed, until you have + as much records as cron workers. diff --git a/queue_job_cron_jobrunner/readme/CONTRIBUTORS.rst b/queue_job_cron_jobrunner/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..59b447f28a --- /dev/null +++ b/queue_job_cron_jobrunner/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Camptocamp `_ + + * Iván Todorovich diff --git a/queue_job_cron_jobrunner/readme/DESCRIPTION.rst b/queue_job_cron_jobrunner/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..e713aa89a9 --- /dev/null +++ b/queue_job_cron_jobrunner/readme/DESCRIPTION.rst @@ -0,0 +1,14 @@ +This module implements a simple ``queue.job`` runner using ``ir.cron`` triggers. + +It's meant to be used on environments where the regular job runner can't be run, like +on Odoo.sh. + +Unlike the regular job runner, where jobs are dispatched to the HttpWorkers, jobs are +processed on the CronWorker threads by the job runner crons. This is a design decision +because: + +* Odoo.sh puts HttpWorkers to sleep when there's no network activity +* HttpWorkers are meant for traffic. Users shouldn't pay the price of background tasks. + +For now, it only implements the most basic features of the ``queue_job`` runner, notably +no channel capacity nor priorities. Please check the ROADMAP for further details. diff --git a/queue_job_cron_jobrunner/readme/ROADMAP.rst b/queue_job_cron_jobrunner/readme/ROADMAP.rst new file mode 100644 index 0000000000..b82e199202 --- /dev/null +++ b/queue_job_cron_jobrunner/readme/ROADMAP.rst @@ -0,0 +1,3 @@ +* Support channel capacity and priority. (See ``_acquire_one_job``) +* Gracefully handle CronWorker CPU timeouts. (See ``_job_runner``) +* Commit transaction after job state updated to started. (See ``_process``) diff --git a/queue_job_cron_jobrunner/static/description/icon.png b/queue_job_cron_jobrunner/static/description/icon.png new file mode 100644 index 0000000000..3a0328b516 Binary files /dev/null and b/queue_job_cron_jobrunner/static/description/icon.png differ diff --git a/queue_job_cron_jobrunner/static/description/index.html b/queue_job_cron_jobrunner/static/description/index.html new file mode 100644 index 0000000000..a878a31c23 --- /dev/null +++ b/queue_job_cron_jobrunner/static/description/index.html @@ -0,0 +1,475 @@ + + + + + + +Queue Job Cron Jobrunner + + + +
+

Queue Job Cron Jobrunner

+ + +

Alpha License: AGPL-3 OCA/queue Translate me on Weblate Try me on Runbot

+

This module implements a simple queue.job runner using ir.cron triggers.

+

It’s meant to be used on environments where the regular job runner can’t be run, like +on Odoo.sh.

+

Unlike the regular job runner, where jobs are dispatched to the HttpWorkers, jobs are +processed on the CronWorker threads by the job runner crons. This is a design decision +because:

+
    +
  • Odoo.sh puts HttpWorkers to sleep when there’s no network activity
    • +
  • HttpWorkers are meant for traffic. Users shouldn’t pay the price of background tasks.
    • +
+

For now, it only implements the most basic features of the queue_job runner, notably +no channel capacity nor priorities. Please check the ROADMAP for further details.

+
+

Important

+

This is an alpha version, the data model and design can change at any time without warning. +Only for development or testing purpose, do not use in production. +More details on development status

+
+

Table of contents

+ +
+

Configuration

+
+

Warning

+

Don’t use this module if you’re already running the regular queue_job runner.

+
+

For the easiest case, no configuration is required besides installing the module.

+

To avoid CronWorker CPU timeout from abruptly stopping the job processing cron, it’s +recommended to launch Odoo with --limit-time-real-cron=0, to disable the CronWorker +timeout altogether.

+
+

Note

+

In Odoo.sh, this is done by default.

+
+

Parallel execution of jobs can be achieved by leveraging multiple ir.cron records:

+
    +
  • Make sure you have enough CronWorkers available (Odoo CLI --max-cron-threads)
    • +
  • Duplicate the queue_job_cron cron record as many times as needed, until you have +as much records as cron workers.
    • +
+
+
+

Known issues / Roadmap

+
    +
  • Support channel capacity and priority. (See _acquire_one_job)
    • +
  • Gracefully handle CronWorker CPU timeouts. (See _job_runner)
    • +
  • Commit transaction after job state updated to started. (See _process)
    • +
+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Camptocamp SA
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

Current maintainer:

+

ivantodorovich

+

This module is part of the OCA/queue project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/queue_job_cron_jobrunner/tests/__init__.py b/queue_job_cron_jobrunner/tests/__init__.py new file mode 100644 index 0000000000..42bd479ed0 --- /dev/null +++ b/queue_job_cron_jobrunner/tests/__init__.py @@ -0,0 +1 @@ +from . import test_queue_job diff --git a/queue_job_cron_jobrunner/tests/test_queue_job.py b/queue_job_cron_jobrunner/tests/test_queue_job.py new file mode 100644 index 0000000000..dd338bb3f7 --- /dev/null +++ b/queue_job_cron_jobrunner/tests/test_queue_job.py @@ -0,0 +1,49 @@ +# Copyright 2022 Camptocamp SA (https://www.camptocamp.com). +# @author Iván Todorovich +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from freezegun import freeze_time + +from odoo.tests.common import TransactionCase +from odoo.tools import mute_logger + + +class TestQueueJob(TransactionCase): + def setUp(self): + super().setUp() + self.env = self.env(context=dict(self.env.context, tracking_disable=True)) + self.cron = self.env.ref("queue_job_cron_jobrunner.queue_job_cron") + + @mute_logger("odoo.addons.queue_job_cron_jobrunner.models.queue_job") + def test_queue_job_process(self): + """Test that jobs are processed by the queue job cron""" + # Create some jobs + job1 = self.env["res.partner"].with_delay().create({"name": "test"}) + job1_record = job1.db_record() + job2 = self.env["res.partner"].with_delay().create(False) + job2_record = job2.db_record() + job3 = self.env["res.partner"].with_delay(eta=3600).create({"name": "Test"}) + job3_record = job3.db_record() + # Run the job processing cron + self.env["queue.job"]._job_runner(commit=False) + # Check that the jobs were processed + self.assertEqual(job1_record.state, "done", "Processed OK") + self.assertEqual(job2_record.state, "failed", "Has errors") + self.assertEqual(job3_record.state, "pending", "Still pending, because of eta") + + @freeze_time("2022-02-22 22:22:22") + def test_queue_job_cron_trigger_enqueue_dependencies(self): + """Test that ir.cron execution enqueue waiting dependencies""" + delayable = self.env["res.partner"].delayable().create({"name": "test"}) + delayable2 = self.env["res.partner"].delayable().create({"name": "test2"}) + delayable.on_done(delayable2) + delayable.delay() + job_record = delayable._generated_job.db_record() + job_record_depends = delayable2._generated_job.db_record() + + self.env["queue.job"]._job_runner(commit=False) + + self.assertEqual(job_record.state, "done", "Processed OK") + # if the state is "waiting_dependencies", it means the "enqueue_waiting()" + # step has not been doen when the parent job has been done + self.assertEqual(job_record_depends.state, "done", "Processed OK") diff --git a/queue_job_cron_jobrunner/views/ir_cron.xml b/queue_job_cron_jobrunner/views/ir_cron.xml new file mode 100644 index 0000000000..f1fe6a7455 --- /dev/null +++ b/queue_job_cron_jobrunner/views/ir_cron.xml @@ -0,0 +1,22 @@ + + + + + + ir.cron + + + + + + + + + diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt deleted file mode 100644 index 786588ab49..0000000000 --- a/setup/_metapackage/VERSION.txt +++ /dev/null @@ -1 +0,0 @@ -14.0.20221019.0 \ No newline at end of file diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py deleted file mode 100644 index c493dfc17a..0000000000 --- a/setup/_metapackage/setup.py +++ /dev/null @@ -1,26 +0,0 @@ -import setuptools - -with open('VERSION.txt', 'r') as f: - version = f.read().strip() - -setuptools.setup( - name="odoo14-addons-oca-queue", - description="Meta package for oca-queue Odoo addons", - version=version, - install_requires=[ - 'odoo14-addon-base_import_async', - 'odoo14-addon-queue_job', - 'odoo14-addon-queue_job_batch', - 'odoo14-addon-queue_job_context', - 'odoo14-addon-queue_job_cron', - 'odoo14-addon-queue_job_subscribe', - 'odoo14-addon-test_base_import_async', - 'odoo14-addon-test_queue_job', - 'odoo14-addon-test_queue_job_batch', - ], - classifiers=[ - 'Programming Language :: Python', - 'Framework :: Odoo', - 'Framework :: Odoo :: 14.0', - ] -) diff --git a/setup/base_import_async/odoo/addons/base_import_async b/setup/base_import_async/odoo/addons/base_import_async index 9c5e2709fa..0a110e42a8 120000 --- a/setup/base_import_async/odoo/addons/base_import_async +++ b/setup/base_import_async/odoo/addons/base_import_async @@ -1 +1 @@ -../../../../base_import_async/ \ No newline at end of file +../../../../base_import_async \ No newline at end of file diff --git a/setup/queue_job_cron_jobrunner/odoo/addons/queue_job_cron_jobrunner b/setup/queue_job_cron_jobrunner/odoo/addons/queue_job_cron_jobrunner new file mode 120000 index 0000000000..9ec9686861 --- /dev/null +++ b/setup/queue_job_cron_jobrunner/odoo/addons/queue_job_cron_jobrunner @@ -0,0 +1 @@ +../../../../queue_job_cron_jobrunner \ No newline at end of file diff --git a/setup/queue_job_cron_jobrunner/setup.py b/setup/queue_job_cron_jobrunner/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/queue_job_cron_jobrunner/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/setup/test_base_import_async/odoo/addons/test_base_import_async b/setup/test_base_import_async/odoo/addons/test_base_import_async index 5a932030c6..1da8a69c67 120000 --- a/setup/test_base_import_async/odoo/addons/test_base_import_async +++ b/setup/test_base_import_async/odoo/addons/test_base_import_async @@ -1 +1 @@ -../../../../test_base_import_async/ \ No newline at end of file +../../../../test_base_import_async \ No newline at end of file