Skip to content

Commit

Permalink
fix(fs): correct disk usage calculation for ext* filesystems
Browse files Browse the repository at this point in the history 
Signed-off-by: ernolf <raphael.gradenwitz@googlemail.com>
  • Loading branch information
@ernolf
ernolf committed Sep 4, 2024
1 parent bdc2b66 commit 23f7733
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 21 deletions.
7 changes: 4 additions & 3 deletions lib/OperatingSystems/FreeBSD.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,10 @@ public function getDiskInfo(): array {
$disk = new Disk();
$disk->setDevice($filesystem);
$disk->setFs($matches['Type'][$i]);
$disk->setUsed((int)((int)$matches['Used'][$i] / 1024));
$disk->setAvailable((int)((int)$matches['Available'][$i] / 1024));
$disk->setPercent($matches['Capacity'][$i]);
$used = $matches['Blocks'][$i] - $matches['Available'][$i];

Check failure on line 202 in lib/OperatingSystems/FreeBSD.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

InvalidOperand 

lib/OperatingSystems/FreeBSD.php:202:12: InvalidOperand: Cannot perform a numeric operation with non-numeric types string and string (see https://psalm.dev/058)
$disk->setUsed((int) ceil($used / 1024));
$disk->setAvailable((int) floor($matches['Available'][$i] / 1024));

Check failure on line 204 in lib/OperatingSystems/FreeBSD.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

InvalidOperand 

lib/OperatingSystems/FreeBSD.php:204:36: InvalidOperand: Cannot perform a numeric operation with a non-numeric type string (see https://psalm.dev/058)
$disk->setPercent(round(($used * 100 / $matches['Blocks'][$i]), 2) . '%');

Check failure on line 205 in lib/OperatingSystems/FreeBSD.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

InvalidOperand 

lib/OperatingSystems/FreeBSD.php:205:43: InvalidOperand: Cannot perform a numeric operation with a non-numeric type string (see https://psalm.dev/058)
$disk->setMount($matches['Mounted'][$i]);

$data[] = $disk;
Expand Down
7 changes: 4 additions & 3 deletions lib/OperatingSystems/Linux.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,10 @@ public function getDiskInfo(): array {
$disk = new Disk();
$disk->setDevice($filesystem);
$disk->setFs($matches['Type'][$i]);
$disk->setUsed((int)((int)$matches['Used'][$i] / 1024));
$disk->setAvailable((int)((int)$matches['Available'][$i] / 1024));
$disk->setPercent($matches['Capacity'][$i]);
$used = $matches['Blocks'][$i] - $matches['Available'][$i];

Check failure on line 220 in lib/OperatingSystems/Linux.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

InvalidOperand 

lib/OperatingSystems/Linux.php:220:12: InvalidOperand: Cannot perform a numeric operation with non-numeric types string and string (see https://psalm.dev/058)
$disk->setUsed((int) ceil($used / 1024));
$disk->setAvailable((int) floor($matches['Available'][$i] / 1024));

Check failure on line 222 in lib/OperatingSystems/Linux.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

InvalidOperand 

lib/OperatingSystems/Linux.php:222:36: InvalidOperand: Cannot perform a numeric operation with a non-numeric type string (see https://psalm.dev/058)
$disk->setPercent(round(($used * 100 / $matches['Blocks'][$i]), 2) . '%');

Check failure on line 223 in lib/OperatingSystems/Linux.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

InvalidOperand 

lib/OperatingSystems/Linux.php:223:43: InvalidOperand: Cannot perform a numeric operation with a non-numeric type string (see https://psalm.dev/058)
$disk->setMount($matches['Mounted'][$i]);

$data[] = $disk;
Expand Down
51 changes: 36 additions & 15 deletions tests/lib/LinuxTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,57 +143,78 @@ public function testGetDiskInfo(): void {
$disk1 = new Disk();
$disk1->setDevice('/dev/mapper/homestead--vg-root');
$disk1->setFs('ext4');
$disk1->setUsed(6060);
$disk1->setAvailable(46212);
$disk1->setPercent('12%');
// $size1 = 56422560;
// $available1 = 47321220;
$used1 = 9101340; // $size1 - $available1
$disk1->setUsed(8889); // ceil(9101340 / 1024); (= 8888.0273)
$disk1->setAvailable(46212); // floor(47321220 / 1024); (= 46212.1289)
$disk1->setPercent('16.13%'); // round(($used1 * 100 / $size1), 2) . '%'; (= 16.1307%)
$disk1->setMount('/');

$disk2 = new Disk();
$disk2->setDevice('/dev/mapper/homestead--vg-mysql--master');
$disk2->setFs('ext4');
$disk2->setUsed(251);
// $size2 = 65531436;
// $available2 = 61902400;
$used2 = 3629036;
$disk2->setUsed(3544);
$disk2->setAvailable(60451);
$disk2->setPercent('1%');
$disk2->setPercent('5.54%');
$disk2->setMount('/homestead-vg/master');

$disk3 = new Disk();
$disk3->setDevice('vagrant');
$disk3->setFs('vboxsf');
$disk3->setUsed(600421);
// $size3 = 958123168;
// $available3 = 343292036;
$used3 = 614831132;
$disk3->setUsed(600422);
$disk3->setAvailable(335246);
$disk3->setPercent('65%');
$disk3->setPercent('64.17%');
$disk3->setMount('/vagrant');

$disk4 = new Disk();
$disk4->setDevice('home_vagrant_code');
$disk4->setFs('vboxsf');
$disk4->setUsed(600421);
// $size4 = 958123168;
// $available4 = 343292036;
$used4 = 614831132;
$disk4->setUsed(600422);
$disk4->setAvailable(335246);
$disk4->setPercent('65%');
$disk4->setPercent('64.17%');
$disk4->setMount('/home/vagrant/code');

$disk5 = new Disk();
$disk5->setDevice('nfs.example.com:/export');
$disk5->setFs('nfs4');
$disk5->setUsed(0);
// $size5 = 14820;
// $available5 = 1230
$used5 = 13590;
$disk5->setUsed(14);
$disk5->setAvailable(1);
$disk5->setPercent('0%');
$disk5->setPercent('91.7%');
$disk5->setMount('/nfs');

$disk6 = new Disk();
$disk6->setDevice('198.51.100.42:/storage');
$disk6->setFs('fuse.sshfs');
$disk6->setUsed(51);
// $size6 = 47929956;
// $available6 = 45419052;
$used6 = 2510904;
$disk6->setUsed(2453);
$disk6->setAvailable(44354);
$disk6->setPercent('1%');
$disk6->setPercent('5.24%');
$disk6->setMount('/mnt/sshfs');

$disk7 = new Disk();
$disk7->setDevice('/dev/vda5');
$disk7->setFs('ext4');
$disk7->setUsed(107508);
// $size7 = 205314024;
// $available7 = 84722884;
$used7 = 120591140;
$disk7->setUsed(117765);
$disk7->setAvailable(82737);
$disk7->setPercent('57%');
$disk7->setPercent('58.74%');
$disk7->setMount('/nextcloud/my.cloud.domain.xx');

$this->assertEquals([$disk1, $disk2, $disk3, $disk4, $disk5, $disk6, $disk7], $this->os->getDiskInfo());
Expand Down

0 comments on commit 23f7733

Please sign in to comment.