Skip to content

fix(BackgroundJob): Add time leeway in start condition in TimedJob #50868

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −1
Open

fix(BackgroundJob): Add time leeway in start condition in TimedJob #50868

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion lib/public/BackgroundJob/TimedJob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
* @since 15.0.0
*/
abstract class TimedJob extends Job {
protected static int $lastRunCheckMargin = 20;
protected int $interval = 0;
protected int $timeSensitivity = IJob::TIME_SENSITIVE;

Expand Down Expand Up @@ -81,7 +82,7 @@ final public function execute(IJobList $jobList, ?ILogger $logger = null) {
* @since 25.0.0
*/
final public function start(IJobList $jobList): void {
if (($this->time->getTime() - $this->lastRun) > $this->interval) {
if (($this->time->getTime() - $this->lastRun) > $this->interval - self::$lastRunCheckMargin) {
if ($this->interval >= 12 * 60 * 60 && $this->isTimeSensitive()) {
Server::get(LoggerInterface::class)->debug('TimedJob ' . get_class($this) . ' has a configured interval of ' . $this->interval . ' seconds, but is also marked as time sensitive. Please consider marking it as time insensitive to allow more sensitive jobs to run when needed.');
}
Expand Down