starred/coolify
1
0
Fork 0
mirror of https://github.com/coollabsio/coolify.git synced 2026-11-06 13:10:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(deployments): advance the queue on all servers after a cancel

Browse Source 
- A queued deployment on a deleted server no longer stops the queue;
  one deployment that fails to start does not stop the others
- Cancelling a deployment starts the queued deployments of the same
  application on all servers, as a finished deployment does
This commit is contained in:
Andras Bacsai
2026-10-05 23:10:52 +02:00
parent fbd6c5be21
commit 6cc6f1081d
7 changed files with 161 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootstrap/helpers/applications.php
+20 -3
View File
@@ -153,7 +153,7 @@ function queue_next_deployment(Application $application, ?int $finished_deployme
->where('status', ApplicationDeploymentStatus::QUEUED)
->distinct()
->pluck('server_id');
$server_ids = collect([$application->destination->server_id, $finished_deployment_server_id])
$server_ids = collect([$application->destination?->server_id, $finished_deployment_server_id])
->merge($application_queued_server_ids)
->filter(fn ($server_id) => $server_id !== null)
->unique()
@@ -164,7 +164,11 @@ function queue_next_deployment(Application $application, ?int $finished_deployme
->sortBy('created_at');
foreach ($queued_deployments as $next_deployment) {
start_queued_deployment($next_deployment);
try {
start_queued_deployment($next_deployment);
} catch (Throwable $e) {
Log::warning("Failed to start queued deployment {$next_deployment->deployment_uuid}: {$e->getMessage()}");
}
}
}
@@ -264,7 +268,11 @@ function next_queuable(string $server_id, string $application_id, string $commit
}
// Check server's concurrent build limit
// A deleted server keeps its queued deployments; they cannot run anymore.
$server = Server::find($server_id);
if (! $server) {
return false;
}
$concurrent_builds = $server->settings->concurrent_builds;
$active_deployments = ApplicationDeploymentQueue::where('server_id', $server_id)
->where('status', ApplicationDeploymentStatus::IN_PROGRESS->value)
@@ -276,8 +284,17 @@ function next_queuable(string $server_id, string $application_id, string $commit
return true;
}
function next_after_cancel(?Server $server = null)
/**
* Start the queued deployments that can run after a cancellation. With the application of the
* cancelled deployment, its queued deployments on all servers start too, as when a deployment ends.
*/
function next_after_cancel(?Server $server = null, ?Application $application = null)
{
if ($application) {
queue_next_deployment($application, $server?->id);
return;
}
if ($server) {
$next_found = ApplicationDeploymentQueue::where('server_id', data_get($server, 'id'))
->where('status', ApplicationDeploymentStatus::QUEUED)