Skip to content

[stable34] fix(jobs): resolve portability issues with background job cleanup #62279

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 27, 2026
Merged

[stable34] fix(jobs): resolve portability issues with background job cleanup #62279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e6469e
fix(jobs): resolve portability issues with background job cleanup
stklcode Jul 5, 2026
254b39e
fix(jobs): restore background_jobs_expiration_days behavior
stklcode Jul 5, 2026
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
8 changes: 3 additions & 5 deletions core/BackgroundJobs/CleanupBackgroundJobsJob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,9 @@ private function reapCrashedJobs(): void {
if ($job->serverId !== $currentServerId) {
continue;
}
$output = [];
$result = 0;
exec('ps -p ' . escapeshellarg((string)$job->pid) . ' -o cmd', $output, $result);
if (count($output) === 1 && current($output) === 'CMD' && $result === 1) {
// Process doesn't exists anymore
$processExists = posix_kill($job->pid, 0) || posix_get_last_error() === 1 /* EPERM */;
if (!$processExists) {
// Process doesn't exist anymore
$maxDuration = (new DateTimeImmutable())->diff($job->startedAt);
$maxDuration
= ($maxDuration->days * 24 * 60 * 60 * 1000)
Expand Down
1 change: 0 additions & 1 deletion lib/private/BackgroundJob/JobRuns.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ public function finished(int|string $runId, int $duration, int $memoryPeakUsage,

public function deleteBefore(int $timestamp): int {
$beforeSnowflake = $this->snowflakeGenerator->minForTimeId($timestamp);
$beforeSnowflake = '91480652934574081';
$qb = $this->connection->getQueryBuilder();
$result = $qb
->delete(self::TABLE)
Expand Down
Loading