mirror of
https://github.com/Vateron-Media/XC_VM.git
synced 2026-10-25 19:03:14 +01:00
Claude
6bc29e8ee7
Review fixes for the php_pids change.
- cron:users judged a remote PHP-served connection by date_start, but a
reused connection (VOD range/seek, TS or timeshift reconnect) gets a new
worker pid and keeps its original date_start. A pid assigned after the
node's last heartbeat was then looked up in a list that could not hold
it, and the live viewer was killed. The pid write also stamps
hls_last_read (MAIN's clock), so the later of the two now dates the pid.
The check moves into isRemoteWorkerRunning().
- phpFpmWorkerPIDs() returns null when no FPM master is visible, so an
idle ondemand pool ("[]") now reaps dead workers' rows while an unknown
list still keeps them. A server missing from either map no longer hits
count(null).
- getAllSimple/getStreamingSimple/getProxySimple and the admin API
get_server leave out php_pids; getById keeps the full row for REPLACE.
- Tests pin the watchdog and reaper wiring, exercise sort(), and reset
the ServerRepository db seam; array_unique() is dropped (unreachable).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TQHeypQpfAXTdCysmi7b6a
109 lines
4.2 KiB
PHP
109 lines
4.2 KiB
PHP
<?php
|
|
|
|
use PHPUnit\Framework\TestCase;
|
|
use XcVm\Core\Cache\FileCache;
|
|
use XcVm\Domain\Server\ServerRepository;
|
|
use XcVm\Public\Controllers\Api\AdminAPIWrapper;
|
|
|
|
/**
|
|
* ServerRepository::getAll keeps servers.php_pids out of the rows it returns
|
|
* and of the 'servers' cache that every stream request reads. The column holds
|
|
* one pid per live PHP-FPM worker of a node; only MAIN's cron:users needs it,
|
|
* and it reads the column itself. (CacheCronJob's unset($rServers['php_pids'])
|
|
* meant to strip it, but the map is keyed by server id, so it did nothing.)
|
|
* The Simple readers every admin request runs, and the admin API's
|
|
* get_server, leave it out too. getById keeps it: ServerService writes that
|
|
* row back whole with REPLACE.
|
|
*/
|
|
final class ServerRepositoryPhpPidsTest extends TestCase {
|
|
|
|
private TestDb $db;
|
|
|
|
private $rSettingsBackup;
|
|
|
|
private $rSchemeBackup;
|
|
|
|
protected function setUp(): void {
|
|
if (!defined('CACHE_TMP_PATH')) {
|
|
$rDir = dirname(__DIR__) . '/.tmp/cache/';
|
|
@mkdir($rDir, 0755, true);
|
|
define('CACHE_TMP_PATH', $rDir);
|
|
}
|
|
@mkdir(CACHE_TMP_PATH, 0755, true);
|
|
if (!defined('SERVER_ID')) {
|
|
define('SERVER_ID', 1);
|
|
}
|
|
|
|
$this->rSettingsBackup = $GLOBALS['rSettings'] ?? null;
|
|
$this->rSchemeBackup = $_SERVER['REQUEST_SCHEME'] ?? null;
|
|
$GLOBALS['rSettings'] = ['live_streaming_pass' => 'x'];
|
|
|
|
$this->db = new TestDb();
|
|
$this->db->exec(
|
|
'CREATE TABLE servers (id INTEGER PRIMARY KEY, server_type INTEGER, is_main INTEGER, enabled INTEGER, status INTEGER, last_check_ago INTEGER, parent_id TEXT, domain_name TEXT, server_ip TEXT, private_ip TEXT, enable_https INTEGER, http_broadcast_port INTEGER, https_broadcast_port INTEGER, rtmp_port INTEGER, geoip_countries TEXT, isp_names TEXT, watchdog_data TEXT, php_pids TEXT, `order` INTEGER);'
|
|
);
|
|
$this->db->query(
|
|
'INSERT INTO servers (id, server_type, is_main, enabled, status, last_check_ago, parent_id, domain_name, server_ip, private_ip, enable_https, http_broadcast_port, https_broadcast_port, rtmp_port, geoip_countries, isp_names, watchdog_data, php_pids, `order`) VALUES
|
|
(7, 0, 0, 1, 1, ?, NULL, "", "10.0.0.7", "", 0, 80, 443, 8880, "", "", "{}", "[11,12]", 0),
|
|
(8, 1, 0, 1, 1, ?, "[7]", "", "10.0.0.8", "", 0, 80, 443, 8880, "", "", "{}", "[21]", 0);',
|
|
time(),
|
|
time()
|
|
);
|
|
ServerRepository::setDb($this->db);
|
|
}
|
|
|
|
protected function tearDown(): void {
|
|
FileCache::delCache('servers');
|
|
(new ReflectionProperty(ServerRepository::class, 'db'))->setValue(null, null);
|
|
$GLOBALS['rSettings'] = $this->rSettingsBackup;
|
|
if ($this->rSchemeBackup === null) {
|
|
unset($_SERVER['REQUEST_SCHEME']);
|
|
} else {
|
|
$_SERVER['REQUEST_SCHEME'] = $this->rSchemeBackup;
|
|
}
|
|
}
|
|
|
|
public function testReturnedRowsCarryNoPhpPids(): void {
|
|
$rServers = ServerRepository::getAll(true);
|
|
|
|
$this->assertArrayHasKey(7, $rServers);
|
|
$this->assertSame('10.0.0.7', $rServers[7]['server_ip'], 'the row itself is still loaded');
|
|
$this->assertArrayNotHasKey('php_pids', $rServers[7]);
|
|
}
|
|
|
|
public function testCachedRowsCarryNoPhpPids(): void {
|
|
ServerRepository::getAll(true);
|
|
|
|
$rCache = FileCache::getCache('servers');
|
|
$this->assertIsArray($rCache);
|
|
$this->assertArrayHasKey(7, $rCache);
|
|
$this->assertArrayNotHasKey('php_pids', $rCache[7]);
|
|
}
|
|
|
|
public function testSimpleReadersCarryNoPhpPids(): void {
|
|
$rAll = ServerRepository::getAllSimple();
|
|
$rStreaming = ServerRepository::getStreamingSimple(null, 'all');
|
|
$rProxies = ServerRepository::getProxySimple();
|
|
|
|
$this->assertSame([7, 8], array_keys($rAll));
|
|
$this->assertArrayNotHasKey('php_pids', $rAll[7]);
|
|
$this->assertArrayNotHasKey('php_pids', $rAll[8]);
|
|
$this->assertSame([7], array_keys($rStreaming));
|
|
$this->assertArrayNotHasKey('php_pids', $rStreaming[7]);
|
|
$this->assertSame([8], array_keys($rProxies));
|
|
$this->assertArrayNotHasKey('php_pids', $rProxies[8]);
|
|
}
|
|
|
|
public function testAdminApiServerCarriesNoPhpPids(): void {
|
|
$rResult = AdminAPIWrapper::getServer(7);
|
|
|
|
$this->assertSame('STATUS_SUCCESS', $rResult['status']);
|
|
$this->assertSame('10.0.0.7', $rResult['data']['server_ip']);
|
|
$this->assertArrayNotHasKey('php_pids', $rResult['data']);
|
|
}
|
|
|
|
public function testGetByIdKeepsTheFullRow(): void {
|
|
$this->assertSame('[11,12]', ServerRepository::getById(7)['php_pids']);
|
|
}
|
|
}
|