Skip to content

feat(BackgroundJobs): Allow preventing parallel runs for a job class - #37835

Merged
come-nc merged 15 commits into
masterfrom
feat/background-allow-parallel-runs
Apr 25, 2023
Merged

feat(BackgroundJobs): Allow preventing parallel runs for a job class#37835
come-nc merged 15 commits into
masterfrom
feat/background-allow-parallel-runs

Conversation

@marcelklehr

@marcelklehrmarcelklehr commented Apr 20, 2023

Copy link
Copy Markdown
Member

Summary

This PR adds a setAllowParallelRuns() method to the BackgroundJob\Job abstract class in order to allow jobs to disallow parallel runs.

Checklist

marcelklehr
marcelklehr commented Apr 20, 2023
View reviewed changes
Comment threadtests/lib/BackgroundJob/TestJob.php
nickvergessen
nickvergessen reviewed Apr 20, 2023
View reviewed changes
Comment threadlib/private/BackgroundJob/JobList.php Outdated
Comment threadlib/public/BackgroundJob/Job.php Outdated
marcelklehr
marcelklehr commented Apr 20, 2023
View reviewed changes
Comment threadlib/private/BackgroundJob/JobList.php Outdated
@marcelklehrmarcelklehr mentioned this pull request Apr 20, 2023
Merged
@szaimenszaimen added the 2. developing Work in progress label Apr 20, 2023
@szaimenszaimen added this to the Nextcloud 27 milestone Apr 20, 2023
nickvergessen
nickvergessen reviewed Apr 20, 2023
View reviewed changes
Comment threadlib/public/BackgroundJob/IParallelAwareJob.php
nickvergessen
nickvergessen reviewed Apr 21, 2023
View reviewed changes
Comment threadlib/private/BackgroundJob/JobList.php Outdated
nickvergessen
nickvergessen reviewed Apr 21, 2023
View reviewed changes
Comment threadtests/lib/BackgroundJob/TestJob.php
@nickvergessen

nickvergessen commented Apr 21, 2023

Copy link
Copy Markdown
Member

you need to rebase on master to fix the red ci

@marcelklehr
marcelklehrforce-pushed the feat/background-allow-parallel-runs branch from 4eb91d0 to 75a13f2CompareApril 21, 2023 08:52
@marcelklehr

marcelklehr commented Apr 21, 2023

Copy link
Copy Markdown
MemberAuthor

Didn't help.

@skjnldsv

skjnldsv commented Apr 21, 2023

Copy link
Copy Markdown
Member

Didn't help.

#37858

@nickvergessen

nickvergessen commented Apr 21, 2023

Copy link
Copy Markdown
Member

So time to rebase again

marcelklehrand others added 11 commits April 23, 2023 12:36
@marcelklehr
feat(BackgroundJobs): Allow preventing parallel runs for a job class
c01c516
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
fix(SpeechToText): Prevent parallel runs of TranscriptionJob
ef27bd6
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
test(BackgroundJobs): Add tests for allowParallelRuns and hasReserved…
1296f36
…Jobs
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
fix(tests): Remove duplicated method
56cb5d1
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr@nickvergessen
Update lib/private/BackgroundJob/JobList.php
6f9a321
Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
Add IParallelAwareJob interface
0f3211c
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
JobListTest: clearJobsList before testHasReservedJobs
281c804
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
IParallelAwareJob: Add missing boilerplate
94038e0
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
Fix BackgroundJob tests
5608b50
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
Run cs:Fix
a0c722a
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
JobList#hasReservedJobs: Close cursor
5a7f023
so Joas doesn't die
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
marcelklehrforce-pushed the feat/background-allow-parallel-runs branch from 75a13f2 to 5a7f023CompareApril 23, 2023 10:36
@marcelklehr
Update autoloaders
d1e4a7a
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
come-nc
come-nc reviewed Apr 24, 2023
View reviewed changes
Comment threadlib/private/BackgroundJob/JobList.php
Comment threadtests/lib/BackgroundJob/DummyJobList.php
Comment threadtests/lib/BackgroundJob/JobListTest.php
marcelklehrand others added 2 commits April 24, 2023 12:35
@marcelklehr@come-nc
Update tests/lib/BackgroundJob/DummyJobList.php
6148c5e
Co-authored-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr
JobList: add debug log when hasReservedJob query fails
524d053
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
come-nc
come-nc approved these changes Apr 24, 2023
View reviewed changes

@come-nccome-nc 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.

We have both TestJob.php and JobTest.php files in the same folder xD

@marcelklehr
JobListTest: Fix JobList constructor call
06d6cf4
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr

marcelklehr commented Apr 25, 2023

Copy link
Copy Markdown
MemberAuthor

Can we merge this? CI failure seems unlreated.

@come-nc
come-nc merged commit 7250f54 into masterApr 25, 2023
@come-nc
come-nc deleted the feat/background-allow-parallel-runs branch April 25, 2023 10:10
@marcelklehrmarcelklehr mentioned this pull request Apr 25, 2023
Closed
@juliusknorrjuliusknorr mentioned this pull request Jul 10, 2023
Closed
8 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nickvergessennickvergessennickvergessen approved these changes
@come-nccome-nccome-nc approved these changes
@julien-ncjulien-ncAwaiting requested review from julien-nc

Assignees

No one assigned

Labels

2. developingWork in progress

Projects

None yet

Milestone

Nextcloud 27

Development

Successfully merging this pull request may close these issues.

5 participants

@marcelklehr@nickvergessen@skjnldsv@come-nc@szaimen