Skip to content

[stable29] delete background jobs by id when cleaning up #45919

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

Merged
AndyScherzinger merged 2 commits into from
Jul 10, 2024
Merged

[stable29] delete background jobs by id when cleaning up #45919

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a801f0
fix: delete background jobs by id when cleaning up
icewind1991 May 30, 2024
f3c3d89
test: update DummyJobList
icewind1991 May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
test: update DummyJobList 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @AndyScherzinger
icewind1991 authored and AndyScherzinger committed Jul 10, 2024
commit f3c3d890d69ea3bc6a1f6c34a6023085f6cac598
2 changes: 1 addition & 1 deletion lib/public/BackgroundJob/IJobList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public function remove($job, $argument = null): void;
* Remove a job from the list by id
*
* @param int $id
* @since 30.0.0
* @since 29.0.4
*/
public function removeById(int $id): void;

Expand Down
22 changes: 18 additions & 4 deletions tests/lib/BackgroundJob/DummyJobList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class DummyJobList extends \OC\BackgroundJob\JobList {
private array $reserved = [];

private int $last = 0;
private int $lastId = 0;

public function __construct() {
}
Expand All @@ -41,6 +42,8 @@ public function add($job, $argument = null, ?int $firstCheck = null): void {
$job = \OCP\Server::get($job);
}
$job->setArgument($argument);
$job->setId($this->lastId);
$this->lastId++;
if (!$this->has($job, null)) {
$this->jobs[] = $job;
}
Expand All @@ -55,9 +58,20 @@ public function scheduleAfter(string $job, int $runAfter, $argument = null): voi
* @param mixed $argument
*/
public function remove($job, $argument = null): void {
$index = array_search($job, $this->jobs);
if ($index !== false) {
unset($this->jobs[$index]);
foreach ($this->jobs as $index => $listJob) {
if (get_class($job) === get_class($listJob) && $job->getArgument() == $listJob->getArgument()) {
unset($this->jobs[$index]);
return;
}
}
}

public function removeById(int $id): void {
foreach ($this->jobs as $index => $listJob) {
if ($listJob->getId() === $id) {
unset($this->jobs[$index]);
return;
}
}
}

Expand Down Expand Up @@ -127,7 +141,7 @@ public function setLastJob(IJob $job): void {
}
}

public function getById(int $id): IJob {
public function getById(int $id): ?IJob {
foreach ($this->jobs as $job) {
if ($job->getId() === $id) {
return $job;
Expand Down