Skip to content

[18.0][PORT] queue_job: remove dead jobs requeuer cron and automatically requeue dead jobs - #749

Merged
OCA-git-bot merged 7 commits into
OCA:18.0from
acsone:18.0-748-port
Sep 17, 2025
Merged

[18.0][PORT] queue_job: remove dead jobs requeuer cron and automatically requeue dead jobs#749
OCA-git-bot merged 7 commits into
OCA:18.0from
acsone:18.0-748-port

Conversation

@sbidoul

@sbidoulsbidoul commented Mar 3, 2025•
edited by simahawk
Loading

Copy link
Copy Markdown
Member

FW port of #748 + #816

@OCA-git-bot

OCA-git-bot commented Mar 3, 2025

Copy link
Copy Markdown
Contributor

Hi @guewen,
some modules you are maintaining are being modified, check this out!

@sbidoul
sbidoulforce-pushed the 18.0-748-port branch 2 times, most recently from 11688d3 to 58bf17fCompareMarch 3, 2025 17:49
@hbrunn

hbrunn commented Mar 21, 2025

Copy link
Copy Markdown
Member

@sbidoul looks like you have to rewrite this to use savepoints?

@sbidoul

sbidoul commented Mar 21, 2025

Copy link
Copy Markdown
MemberAuthor

I'm note sure it's possible to test that with savepoints, since we test database locks.

@AnizR

sbidoul
sbidoul commented Mar 21, 2025
View reviewed changes
Comment threadqueue_job/tests/test_requeue_dead_job.py Outdated
self.assertEqual(1, len(locks))

# commit to update queue_job records in DB
self.env.cr.commit() # pylint: disable=E8102

@sbidoulsbidoulMar 21, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AnizR in this test, is it necessary to commit?

@AnizRAnizRMar 21, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, otherwise, the row representing a 'lock' will not be created within the db

sbidoul
sbidoul commented Mar 21, 2025
View reviewed changes
Comment threadqueue_job/tests/test_requeue_dead_job.py Outdated
job_obj.set_started()

job_obj.store()
self.env.cr.commit() # pylint: disable=E8102

@sbidoulsbidoulMar 21, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here we could maybe create a job with demo data, and run this test post install.

@AnizRAnizRMar 21, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using data to create some records within the db might be a way to avoid to commit within tests, I'll think about it 👍

@sbidoulsbidoul mentioned this pull request Apr 15, 2025
Merged
baguenth
baguenth reviewed Apr 15, 2025
View reviewed changes
Comment threadqueue_job/migrations/18.0.1.3.0/pre-migration.py Outdated
WHERE
module='queue_job'
AND model='ir.cron'
AND name='ir_cron_queue_job_garbage_collector'

@baguenthbaguenthApr 15, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You may directly want to consider this fix: 46b0d8f

@AnizR
AnizRforce-pushed the 18.0-748-port branch 2 times, most recently from 42a1df0 to f64b966CompareJune 2, 2025 15:08
@rousseldenisrousseldenis added this to the 18.0 milestone Jun 2, 2025
@AnizR

AnizR commented Jun 2, 2025

Copy link
Copy Markdown
Contributor

@hbrunn, I came up with the solution of loading test queue.job records within demo.

What do you think about it?

@AnizR
AnizRforce-pushed the 18.0-748-port branch 2 times, most recently from 5fd02bb to dca717bCompareJune 3, 2025 14:11
sbidoul
sbidoul commented Jun 8, 2025
View reviewed changes
Comment threadqueue_job/demo/queue_job_test_lock.xml Outdated
model="queue.job"
eval="('test_enqueued_job',)"
/>
</odoo>

@sbidoulsbidoulJun 8, 2025

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AnizR this file should be removed as it was moved to test_queue_job?

@AnizRAnizRJun 23, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, well spotted!

@AnizR
AnizRforce-pushed the 18.0-748-port branch 3 times, most recently from 57d2771 to d071197CompareJune 23, 2025 15:38
@sbidoulsbidoul mentioned this pull request Aug 20, 2025
Merged
simahawk
simahawk approved these changes Aug 20, 2025
View reviewed changes

@simahawksimahawk left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Remember to merge w/ nobump.

@sbidoul
sbidoul marked this pull request as draft August 20, 2025 09:04
@sbidoul

sbidoul commented Aug 20, 2025

Copy link
Copy Markdown
MemberAuthor

Setting as draft. There is a conflicts and the tests need some rework.

AnizRand others added 5 commits September 15, 2025 10:11
@AnizR
[IMP] queue_job: remove cron garbage collector and automatically requ…
f10020b
…eue jobs in timeout
[IMP] queue_job: increment 'retry' when re-queuing job that have been killed
@sbidoul@AnizR
[IMP] queue_job: use queue_job_lock model
4e517f7
A model is better than a manually managed table as it will
protect the table from deletion by database_cleanup.
@sbidoul@AnizR
[IMP] queue_job: tweak comment and warning message
5aaf399
@baguenth@AnizR
[FIX] queue_job: Adapted migration to properly delete the invalid cro…
10395fd
…n job
@AnizR
[IMP] queue_job: remove DB commits within test of requeue
8a346da
@AnizR

AnizR commented Sep 15, 2025

Copy link
Copy Markdown
Contributor

I reworked the tests and decided to isolate the tests in test_queue_job.
Moreover, I managed to remove the .commit() calls.

FrancoMaxime
FrancoMaxime reviewed Sep 15, 2025
View reviewed changes

@FrancoMaximeFrancoMaxime left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM: code review

@OCA-git-bot

OCA-git-bot commented Sep 15, 2025

Copy link
Copy Markdown
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

@sbidoul
sbidoul marked this pull request as ready for review September 17, 2025 14:57
@sbidoul

sbidoul commented Sep 17, 2025

Copy link
Copy Markdown
MemberAuthor

/ocabot merge major

@OCA-git-bot

OCA-git-bot commented Sep 17, 2025

Copy link
Copy Markdown
Contributor

On my way to merge this fine PR!
Prepared branch 18.0-ocabot-merge-pr-749-by-sbidoul-bump-major, awaiting test results.

@OCA-git-bot

OCA-git-bot commented Sep 17, 2025

Copy link
Copy Markdown
Contributor

Congratulations, your PR was merged at c6f5ba8. Thanks a lot for contributing to OCA. ❤️

@OCA-git-bot
OCA-git-bot merged commit b4c689d into OCA:18.0Sep 17, 2025
7 checks passed
@sbidoul
sbidoul deleted the 18.0-748-port branch September 17, 2025 15:21
@simahawksimahawk mentioned this pull request Nov 20, 2025
Closed
@thomaspaulbthomaspaulb mentioned this pull request Jan 8, 2026
Merged
9 tasks
@guewenguewen mentioned this pull request Mar 23, 2026
Open
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@simahawksimahawksimahawk approved these changes
+4 more reviewers
@FrancoMaximeFrancoMaximeFrancoMaxime left review comments
@AnizRAnizRAnizR left review comments
@baguenthbaguenthbaguenth left review comments
@lmarion-sourcelmarion-sourcelmarion-source approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@AnizRAnizR

Labels

approvedmerged 🎉needs reviewready to merge

Projects

None yet

Milestone

18.0

Development

Successfully merging this pull request may close these issues.

10 participants

@sbidoul@OCA-git-bot@hbrunn@AnizR@simahawk@FrancoMaxime@lmarion-source@baguenth@rousseldenis@zamberjo