mirror of
https://github.com/tiennm99/coolify.git
synced 2026-10-16 00:14:48 +00:00
fix(jobs): prevent non-due jobs firing on restart and enrich skip logs with resource links
- Refactor shouldRunNow() to only fire on first run (empty cache) if actually due by cron schedule, preventing spurious executions after cache loss or service restart - Add enrichSkipLogsWithLinks() method to fetch and populate resource names and links for tasks, backups, and docker cleanup jobs in skip logs - Update skip logs UI to display resource column with links to related resources, improving navigation and context - Add fallback display when linked resources are deleted - Expand tests to cover both restart scenarios: non-due jobs (should not fire) and due jobs (should fire)
This commit is contained in:
1 parent
63be5928ab
commit
31555f9e8a
5 files changed
+166
-29
No files matched your search
@@ -341,8 +341,19 @@ class ScheduledJobManager implements ShouldQueue
|
||||
|
||||
$lastDispatched = Cache::get($dedupKey);
|
||||
|
||||
// Run if: never dispatched before, OR there's been a due time since last dispatch
|
||||
if ($lastDispatched === null || $previousDue->gt(Carbon::parse($lastDispatched))) {
|
||||
if ($lastDispatched === null) {
|
||||
// First run after restart or cache loss: only fire if actually due right now.
|
||||
// Seed the cache so subsequent runs can use tolerance/catch-up logic.
|
||||
$isDue = $cron->isDue($executionTime);
|
||||
if ($isDue) {
|
||||
Cache::put($dedupKey, $executionTime->toIso8601String(), 86400);
|
||||
}
|
||||
|
||||
return $isDue;
|
||||
}
|
||||
|
||||
// Subsequent runs: fire if there's been a due time since last dispatch
|
||||
if ($previousDue->gt(Carbon::parse($lastDispatched))) {
|
||||
Cache::put($dedupKey, $executionTime->toIso8601String(), 86400);
|
||||
|
||||
return true;
|
||||
|
||||
@@ -3,8 +3,11 @@
|
||||
namespace App\Livewire\Settings;
|
||||
|
||||
use App\Models\DockerCleanupExecution;
|
||||
use App\Models\ScheduledDatabaseBackup;
|
||||
use App\Models\ScheduledDatabaseBackupExecution;
|
||||
use App\Models\ScheduledTask;
|
||||
use App\Models\ScheduledTaskExecution;
|
||||
use App\Models\Server;
|
||||
use App\Services\SchedulerLogParser;
|
||||
use Illuminate\Support\Carbon;
|
||||
use Illuminate\Support\Collection;
|
||||
@@ -102,13 +105,84 @@ class ScheduledJobs extends Component
|
||||
$parser = new SchedulerLogParser;
|
||||
$allSkips = $parser->getRecentSkips(500, $teamId);
|
||||
$this->skipTotalCount = $allSkips->count();
|
||||
$this->skipLogs = $allSkips->slice($this->skipPage, $this->skipDefaultTake)->values();
|
||||
$this->skipLogs = $this->enrichSkipLogsWithLinks(
|
||||
$allSkips->slice($this->skipPage, $this->skipDefaultTake)->values()
|
||||
);
|
||||
$this->showSkipPrev = $this->skipPage > 0;
|
||||
$this->showSkipNext = ($this->skipPage + $this->skipDefaultTake) < $this->skipTotalCount;
|
||||
$this->skipCurrentPage = intval($this->skipPage / $this->skipDefaultTake) + 1;
|
||||
$this->managerRuns = $parser->getRecentRuns(30, $teamId);
|
||||
}
|
||||
|
||||
private function enrichSkipLogsWithLinks(Collection $skipLogs): Collection
|
||||
{
|
||||
$taskIds = $skipLogs->where('type', 'task')->pluck('context.task_id')->filter()->unique()->values();
|
||||
$backupIds = $skipLogs->where('type', 'backup')->pluck('context.backup_id')->filter()->unique()->values();
|
||||
$serverIds = $skipLogs->where('type', 'docker_cleanup')->pluck('context.server_id')->filter()->unique()->values();
|
||||
|
||||
$tasks = $taskIds->isNotEmpty()
|
||||
? ScheduledTask::with(['application.environment.project', 'service.environment.project'])->whereIn('id', $taskIds)->get()->keyBy('id')
|
||||
: collect();
|
||||
|
||||
$backups = $backupIds->isNotEmpty()
|
||||
? ScheduledDatabaseBackup::with(['database.environment.project'])->whereIn('id', $backupIds)->get()->keyBy('id')
|
||||
: collect();
|
||||
|
||||
$servers = $serverIds->isNotEmpty()
|
||||
? Server::whereIn('id', $serverIds)->get()->keyBy('id')
|
||||
: collect();
|
||||
|
||||
return $skipLogs->map(function (array $skip) use ($tasks, $backups, $servers): array {
|
||||
$skip['link'] = null;
|
||||
$skip['resource_name'] = null;
|
||||
|
||||
if ($skip['type'] === 'task') {
|
||||
$task = $tasks->get($skip['context']['task_id'] ?? null);
|
||||
if ($task) {
|
||||
$skip['resource_name'] = $skip['context']['task_name'] ?? $task->name;
|
||||
$resource = $task->application ?? $task->service;
|
||||
$environment = $resource?->environment;
|
||||
$project = $environment?->project;
|
||||
if ($project && $environment && $resource) {
|
||||
$routeName = $task->application_id
|
||||
? 'project.application.scheduled-tasks'
|
||||
: 'project.service.scheduled-tasks';
|
||||
$routeKey = $task->application_id ? 'application_uuid' : 'service_uuid';
|
||||
$skip['link'] = route($routeName, [
|
||||
'project_uuid' => $project->uuid,
|
||||
'environment_uuid' => $environment->uuid,
|
||||
$routeKey => $resource->uuid,
|
||||
'task_uuid' => $task->uuid,
|
||||
]);
|
||||
}
|
||||
}
|
||||
} elseif ($skip['type'] === 'backup') {
|
||||
$backup = $backups->get($skip['context']['backup_id'] ?? null);
|
||||
if ($backup) {
|
||||
$database = $backup->database;
|
||||
$skip['resource_name'] = $database?->name ?? 'Database backup';
|
||||
$environment = $database?->environment;
|
||||
$project = $environment?->project;
|
||||
if ($project && $environment && $database) {
|
||||
$skip['link'] = route('project.database.backup.index', [
|
||||
'project_uuid' => $project->uuid,
|
||||
'environment_uuid' => $environment->uuid,
|
||||
'database_uuid' => $database->uuid,
|
||||
]);
|
||||
}
|
||||
}
|
||||
} elseif ($skip['type'] === 'docker_cleanup') {
|
||||
$server = $servers->get($skip['context']['server_id'] ?? null);
|
||||
if ($server) {
|
||||
$skip['resource_name'] = $server->name;
|
||||
$skip['link'] = route('server.show', ['server_uuid' => $server->uuid]);
|
||||
}
|
||||
}
|
||||
|
||||
return $skip;
|
||||
});
|
||||
}
|
||||
|
||||
private function getExecutions(?int $teamId = null): Collection
|
||||
{
|
||||
$dateFrom = $this->getDateFrom();
|
||||
|
||||
Reference in new issue
Block a user