Reset job disabling timer on adding the job again

[juliusknorr]

If a job run is triggered while having the app disabled the next execution will be delayed for 12 hours

server/lib/private/BackgroundJob/JobList.php

Lines 235 to 241 in 60c3f15

	// set the last_checked to 12h in the future to not check failing jobs all over again
	$reset = $this->connection->getQueryBuilder();
	$reset->update('jobs')
	->set('reserved_at', $reset->expr()->literal(0, IQueryBuilder::PARAM_INT))
	->set('last_checked', $reset->createNamedParameter($this->timeFactory->getTime() + 12 * 3600, IQueryBuilder::PARAM_INT))
	->where($reset->expr()->eq('id', $reset->createNamedParameter($row['id'], IQueryBuilder::PARAM_INT)));
	$reset->execute();

This PR ensures that the job is rescheduled immediately if an app gets enabled and the jobs from appinfo.xml get parsed again in

server/lib/private/Installer.php

Line 160 in 37f40cd

\OC_App::setupBackgroundJobs($info['background-jobs']);

Fixes#30285

[artonge]

Can we prevent duplicate code? But maybe I missed some tiny difference :).

publicfunctionadd($job, $argument = null) {
if ($jobinstanceof IJob) {
$class = get_class($job);
} else {
$class = $job;
}
$argument = json_encode($argument);
if (strlen($argument) > 4000) {
thrownew \InvalidArgumentException('Background job arguments can\'t exceed 4000 characters (json encoded)');
}
$query = $this->connection->getQueryBuilder();
if (!$this->has($job, $argument)) {
$query->insert('jobs')
->values([
'class' => $query->createNamedParameter($class),
'argument' => $query->createNamedParameter($argument),
'last_run' => $query->createNamedParameter(0, IQueryBuilder::PARAM_INT),
'last_checked' => $query->createNamedParameter($this->timeFactory->getTime(), IQueryBuilder::PARAM_INT),
]);
} else {
$query->update('jobs')
->set('reserved_at', $query->expr()->literal(0, IQueryBuilder::PARAM_INT))
->set('last_checked', $query->createNamedParameter($this->timeFactory->getTime(), IQueryBuilder::PARAM_INT))
->where($query->expr()->eq('class', $query->createNamedParameter($class)))
->andWhere($query->expr()->eq('argument', $query->createNamedParameter($argument)));
}
$query->execute();
}

[juliusknorr]

@artonge Pushed a fixup with some minor adjustment because $this->has($job, $argument) requires the original argument instead of the json_encoded one.

[artonge]

We can move $query->execute(); out of the if, but ok for me :)

[juliusknorr]

We can move $query->execute(); out of the if, but ok for me :)

Rebased, squashed, replaced deprecated execute with executeStatement and moved it out of the if as well ;)

[juliusknorr]

/backport to stable23

[juliusknorr]

/backport to stable22

[MichaIng]

/backport to stable21