mirror of
https://github.com/coollabsio/coolify.git
synced 2025-12-28 05:34:50 +00:00
This commit addresses container status reporting issues and removes debug logging: **Primary Fix:** - Changed PushServerUpdateJob to default to 'unknown' instead of 'unhealthy' when health_status field is missing from Sentinel data - This ensures containers WITHOUT healthcheck defined are correctly reported as "unknown" not "unhealthy" - Matches SSH path behavior (GetContainersStatus) which already defaulted to 'unknown' **Service Multi-Container Aggregation:** - Implemented service container status aggregation (same pattern as applications) - Added serviceContainerStatuses collection to both Sentinel and SSH paths - Services now aggregate status using priority: unhealthy > unknown > healthy - Prevents race conditions where last-processed container would win **Debug Logging Cleanup:** - Removed all [STATUS-DEBUG] logging statements (25 total) - Removed all ray() debugging calls (3 total) - Removed proof_unknown_preserved and health_status_was_null debug fields - Code is now production-ready **Test Coverage:** - Added 2 new tests for Sentinel default health status behavior - Added 5 new tests for service aggregation in SSH path - All 16 tests pass (66 assertions) **Note:** The root cause was identified as Sentinel (Go binary) also defaulting to "unhealthy". That will need a separate fix in the Sentinel codebase. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
185 lines
8.1 KiB
PHP
185 lines
8.1 KiB
PHP
<?php
|
|
|
|
/**
|
|
* Unit tests for PushServerUpdateJob status aggregation logic.
|
|
*
|
|
* These tests verify that the job correctly aggregates container statuses
|
|
* when processing Sentinel updates, with proper handling of:
|
|
* - running (healthy) - all containers running and healthy
|
|
* - running (unhealthy) - some containers unhealthy
|
|
* - running (unknown) - some containers with unknown health status
|
|
*
|
|
* The aggregation follows a priority system: unhealthy > unknown > healthy
|
|
*
|
|
* This ensures consistency with GetContainersStatus::aggregateApplicationStatus()
|
|
* and prevents the bug where "unknown" status was incorrectly converted to "healthy".
|
|
*/
|
|
it('aggregates status with unknown health state correctly', function () {
|
|
$jobFile = file_get_contents(__DIR__.'/../../app/Jobs/PushServerUpdateJob.php');
|
|
|
|
// Verify that hasUnknown tracking variable exists
|
|
expect($jobFile)
|
|
->toContain('$hasUnknown = false;')
|
|
->toContain('if (str($status)->contains(\'unknown\')) {')
|
|
->toContain('$hasUnknown = true;');
|
|
|
|
// Verify 3-way status priority logic (unhealthy > unknown > healthy)
|
|
expect($jobFile)
|
|
->toContain('if ($hasUnhealthy) {')
|
|
->toContain('$aggregatedStatus = \'running (unhealthy)\';')
|
|
->toContain('} elseif ($hasUnknown) {')
|
|
->toContain('$aggregatedStatus = \'running (unknown)\';')
|
|
->toContain('} else {')
|
|
->toContain('$aggregatedStatus = \'running (healthy)\';');
|
|
});
|
|
|
|
it('checks for unknown status alongside unhealthy status', function () {
|
|
$jobFile = file_get_contents(__DIR__.'/../../app/Jobs/PushServerUpdateJob.php');
|
|
|
|
// Verify unknown check is placed alongside unhealthy check
|
|
expect($jobFile)
|
|
->toContain('if (str($status)->contains(\'unhealthy\')) {')
|
|
->toContain('if (str($status)->contains(\'unknown\')) {');
|
|
});
|
|
|
|
it('follows same priority as GetContainersStatus', function () {
|
|
$jobFile = file_get_contents(__DIR__.'/../../app/Jobs/PushServerUpdateJob.php');
|
|
$getContainersFile = file_get_contents(__DIR__.'/../../app/Actions/Docker/GetContainersStatus.php');
|
|
|
|
// Both should track hasUnknown
|
|
expect($jobFile)->toContain('$hasUnknown = false;');
|
|
expect($getContainersFile)->toContain('$hasUnknown = false;');
|
|
|
|
// Both should check for 'unknown' in status strings
|
|
expect($jobFile)->toContain('if (str($status)->contains(\'unknown\')) {');
|
|
expect($getContainersFile)->toContain('if (str($status)->contains(\'unknown\')) {');
|
|
|
|
// Both should prioritize unhealthy over unknown over healthy
|
|
expect($jobFile)->toContain('} elseif ($hasUnknown) {');
|
|
expect($getContainersFile)->toContain('} elseif ($hasUnknown) {');
|
|
});
|
|
|
|
it('does not default unknown to healthy status', function () {
|
|
$jobFile = file_get_contents(__DIR__.'/../../app/Jobs/PushServerUpdateJob.php');
|
|
|
|
// The old buggy code was:
|
|
// $aggregatedStatus = $hasUnhealthy ? 'running (unhealthy)' : 'running (healthy)';
|
|
// This would make unknown -> healthy
|
|
|
|
// Verify we're NOT using ternary operator for status assignment
|
|
expect($jobFile)
|
|
->not->toContain('$aggregatedStatus = $hasUnhealthy ? \'running (unhealthy)\' : \'running (healthy)\';');
|
|
|
|
// Verify we ARE using if-elseif-else with proper unknown handling
|
|
expect($jobFile)
|
|
->toContain('if ($hasUnhealthy) {')
|
|
->toContain('} elseif ($hasUnknown) {')
|
|
->toContain('$aggregatedStatus = \'running (unknown)\';');
|
|
});
|
|
|
|
it('initializes all required status tracking variables', function () {
|
|
$jobFile = file_get_contents(__DIR__.'/../../app/Jobs/PushServerUpdateJob.php');
|
|
|
|
// Verify all three tracking variables are initialized together
|
|
$pattern = '/\$hasRunning\s*=\s*false;\s*\$hasUnhealthy\s*=\s*false;\s*\$hasUnknown\s*=\s*false;/s';
|
|
|
|
expect(preg_match($pattern, $jobFile))->toBe(1,
|
|
'All status tracking variables ($hasRunning, $hasUnhealthy, $hasUnknown) should be initialized together');
|
|
});
|
|
|
|
it('preserves unknown status through sentinel updates', function () {
|
|
$jobFile = file_get_contents(__DIR__.'/../../app/Jobs/PushServerUpdateJob.php');
|
|
|
|
// The critical path: when a status contains 'running' AND 'unknown',
|
|
// both flags should be set
|
|
expect($jobFile)
|
|
->toContain('if (str($status)->contains(\'running\')) {')
|
|
->toContain('$hasRunning = true;')
|
|
->toContain('if (str($status)->contains(\'unhealthy\')) {')
|
|
->toContain('$hasUnhealthy = true;')
|
|
->toContain('if (str($status)->contains(\'unknown\')) {')
|
|
->toContain('$hasUnknown = true;');
|
|
|
|
// And then unknown should have priority over healthy in aggregation
|
|
expect($jobFile)
|
|
->toContain('} elseif ($hasUnknown) {')
|
|
->toContain('$aggregatedStatus = \'running (unknown)\';');
|
|
});
|
|
|
|
it('implements service multi-container aggregation', function () {
|
|
$jobFile = file_get_contents(__DIR__.'/../../app/Jobs/PushServerUpdateJob.php');
|
|
|
|
// Verify service container collection exists
|
|
expect($jobFile)
|
|
->toContain('public Collection $serviceContainerStatuses;')
|
|
->toContain('$this->serviceContainerStatuses = collect();');
|
|
|
|
// Verify aggregateServiceContainerStatuses method exists
|
|
expect($jobFile)
|
|
->toContain('private function aggregateServiceContainerStatuses()')
|
|
->toContain('$this->aggregateServiceContainerStatuses();');
|
|
|
|
// Verify service aggregation uses same logic as applications
|
|
expect($jobFile)
|
|
->toContain('$hasUnknown = false;');
|
|
});
|
|
|
|
it('services use same priority as applications', function () {
|
|
$jobFile = file_get_contents(__DIR__.'/../../app/Jobs/PushServerUpdateJob.php');
|
|
|
|
// Both aggregation methods should use the same priority logic
|
|
$applicationAggregation = <<<'PHP'
|
|
if ($hasUnhealthy) {
|
|
$aggregatedStatus = 'running (unhealthy)';
|
|
} elseif ($hasUnknown) {
|
|
$aggregatedStatus = 'running (unknown)';
|
|
} else {
|
|
$aggregatedStatus = 'running (healthy)';
|
|
}
|
|
PHP;
|
|
|
|
// Count occurrences - should appear twice (once for apps, once for services)
|
|
$occurrences = substr_count($jobFile, $applicationAggregation);
|
|
expect($occurrences)->toBeGreaterThanOrEqual(2, 'Priority logic should appear for both applications and services');
|
|
});
|
|
|
|
it('collects service containers before aggregating', function () {
|
|
$jobFile = file_get_contents(__DIR__.'/../../app/Jobs/PushServerUpdateJob.php');
|
|
|
|
// Verify service containers are collected, not immediately updated
|
|
expect($jobFile)
|
|
->toContain('$key = $serviceId.\':\'.$subType.\':\'.$subId;')
|
|
->toContain('$this->serviceContainerStatuses->get($key)->put($containerName, $containerStatus);');
|
|
|
|
// Verify aggregation happens after collection
|
|
expect($jobFile)
|
|
->toContain('$this->aggregateMultiContainerStatuses();')
|
|
->toContain('$this->aggregateServiceContainerStatuses();');
|
|
});
|
|
|
|
it('defaults to unknown when health_status is missing from Sentinel data', function () {
|
|
$jobFile = file_get_contents(__DIR__.'/../../app/Jobs/PushServerUpdateJob.php');
|
|
|
|
// Verify we use null coalescing to default to 'unknown', not 'unhealthy'
|
|
// This is critical for containers without healthcheck defined
|
|
expect($jobFile)
|
|
->toContain('$rawHealthStatus = data_get($container, \'health_status\');')
|
|
->toContain('$containerHealth = $rawHealthStatus ?? \'unknown\';')
|
|
->not->toContain('data_get($container, \'health_status\', \'unhealthy\')');
|
|
});
|
|
|
|
it('matches SSH path default health status behavior', function () {
|
|
$jobFile = file_get_contents(__DIR__.'/../../app/Jobs/PushServerUpdateJob.php');
|
|
$getContainersFile = file_get_contents(__DIR__.'/../../app/Actions/Docker/GetContainersStatus.php');
|
|
|
|
// Both paths should default to 'unknown' when health status is missing
|
|
// Sentinel path: health_status field missing -> 'unknown'
|
|
expect($jobFile)->toContain('?? \'unknown\'');
|
|
|
|
// SSH path: State.Health.Status missing -> 'unknown'
|
|
expect($getContainersFile)->toContain('?? \'unknown\'');
|
|
|
|
// Neither should use 'unhealthy' as default for missing health status
|
|
expect($jobFile)->not->toContain('data_get($container, \'health_status\', \'unhealthy\')');
|
|
});
|