Skip to content

[stable26] Fix FreeBSD: Add Support for Swap Output on TrueNas Core #430

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
kesselb merged 2 commits into from
Mar 7, 2023
Merged

[stable26] Fix FreeBSD: Add Support for Swap Output on TrueNas Core #430

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
5017637
Add Support for Swap Output on TrueNas Core
ConstrictM Feb 24, 2023
3dc1686
Add Test for TrueNAS Memory and Swap Info
ConstrictM Mar 5, 2023
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: 4 additions & 4 deletions lib/OperatingSystems/FreeBSD.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ public function getMemory(): Memory {
}

$matches = [];
$pattern = '/(?>\/dev\/\w+)\s+(?>\d+)\s+(?<Used>\d+)\s+(?<Avail>\d+)\s+(?<Capacity>\d+)/';
$pattern = '/(?>\/dev\/\S+)\s+(?>\d+)\s+(?<Used>\d+)\s+(?<Avail>\d+)\s+(?<Capacity>\d+)/';

$result = preg_match_all($pattern, $swapinfo, $matches);
if ($result === 1) {
$data->setSwapTotal((int)((int)$matches['Avail'][0] / 1024));
$data->setSwapFree(($data->getSwapTotal() - (int)((int)$matches['Used'][0] / 1024)));
if ($result !== 0) {
$data->setSwapTotal((int)((int)array_sum($matches['Avail']) / 1024));
$data->setSwapFree(($data->getSwapTotal() - (int)((int)array_sum($matches['Used']) / 1024)));
}

unset($matches, $result);
Expand Down
5 changes: 5 additions & 0 deletions tests/data/truenas_core_meminfo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
137434759168
4096
5390734
0
1044334
7 changes: 7 additions & 0 deletions tests/data/truenas_core_swapinfo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Device 1K-blocks Used Avail Capacity
/dev/mirror/swap0.eli 2097152 0 2097152 0%
/dev/mirror/swap1.eli 2097152 0 2097152 0%
/dev/mirror/swap2.eli 2097152 0 2097152 0%
/dev/mirror/swap3.eli 16777216 0 16777216 0%
/dev/mirror/swap4.eli 2097152 0 2097152 0%
Total 25165824 0 25165824 0%
16 changes: 16 additions & 0 deletions tests/lib/FreeBSDTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,22 @@ public function testGetMemoryNoData(): void {
$this->assertEquals(new Memory(), $this->os->getMemory());
}

public function testGetMemoryTruenasSwapinfo(): void {
$this->os->method('executeCommand')
->willReturnMap([
['/usr/sbin/swapinfo -k', file_get_contents(__DIR__ . '/../data/truenas_core_swapinfo')],
['/sbin/sysctl -n hw.realmem hw.pagesize vm.stats.vm.v_inactive_count vm.stats.vm.v_cache_count vm.stats.vm.v_free_count', file_get_contents(__DIR__ . '/../data/truenas_core_meminfo')],
]);

$memory = $this->os->getMemory();

$this->assertEquals(131068, $memory->getMemTotal());
$this->assertEquals(-1, $memory->getMemFree());
$this->assertEquals(25136, $memory->getMemAvailable());
$this->assertEquals(24576, $memory->getSwapTotal());
$this->assertEquals(24576, $memory->getSwapFree());
}

public function testGetNetworkInterfaces(): void {
$this->os->method('getNetInterfaces')
->willReturn(json_decode(file_get_contents(__DIR__ . '/../data/freebsd_net_get_interfaces.json'), true, 512, JSON_THROW_ON_ERROR));
Expand Down