Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 15 commits into from
Apr 25, 2023
Merged

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

merged 15 commits into from
Apr 25, 2023

Conversation

marcelklehr
Copy link
Member

Summary

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

Checklist

nickvergessen
nickvergessen reviewed Apr 20, 2023
View reviewed changes
lib/private/BackgroundJob/JobList.php Outdated Show resolved Hide resolved
lib/public/BackgroundJob/Job.php Outdated Show resolved Hide resolved
@marcelklehr marcelklehr mentioned this pull request Apr 20, 2023
Merged
@szaimen szaimen added the 2. developing Work in progress label Apr 20, 2023
@szaimen szaimen added this to the Nextcloud 27 milestone Apr 20, 2023
@nickvergessen
Copy link
Member

you need to rebase on master to fix the red ci

@marcelklehr marcelklehr force-pushed the feat/background-allow-parallel-runs branch from 4eb91d0 to 75a13f2 Compare April 21, 2023 08:52
@marcelklehr
Copy link
Member Author

Didn't help.

@skjnldsv
Copy link
Member

Didn't help.

#37858

@nickvergessen
Copy link
Member

So time to rebase again

marcelklehr and 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 marcelklehr force-pushed the feat/background-allow-parallel-runs branch from 75a13f2 to 5a7f023 Compare April 23, 2023 10:36
@marcelklehr
Update autoloaders
d1e4a7a 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr marcelklehr requested a review from come-nc April 24, 2023 09:17
come-nc
come-nc reviewed Apr 24, 2023
View reviewed changes
lib/private/BackgroundJob/JobList.php Outdated Show resolved Hide resolved
tests/lib/BackgroundJob/DummyJobList.php Outdated Show resolved Hide resolved
tests/lib/BackgroundJob/JobListTest.php Show resolved Hide resolved
marcelklehr and 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
Copy link
Contributor

@come-nc come-nc left a comment

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
Copy link
Member Author

Can we merge this? CI failure seems unlreated.

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

@come-nc come-nc come-nc approved these changes

@nickvergessen nickvergessen nickvergessen approved these changes

@julien-nc julien-nc Awaiting requested review from julien-nc

Assignees
No one assigned
Labels
2. developing Work 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