proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-08-07 19:37:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools: df: handle a failing df

Browse Source 
This function assumed df() will work or hang, but it can
also actually fail and return undef which results in
warnings - let's silence those.
This commit is contained in:
Wolfgang Bumiller 2017-09-11 09:20:08 +02:00
parent 45d51061bc
commit e8c13610c4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/PVE/Tools.pm
View File

@ -983,7 +983,8 @@ sub df {
$pipe->writer(); $pipe->writer();
eval { eval {
my $df = Filesys::Df::df($path, 1); my $df = Filesys::Df::df($path, 1);
print {$pipe} "$df->{blocks}\n$df->{used}\n$df->{bavail}\n"; print {$pipe} "$df->{blocks}\n$df->{used}\n$df->{bavail}\n"
if defined($df);
$pipe->close(); $pipe->close();
}; };
if (my $err = $@) { if (my $err = $@) {
@ -996,9 +997,9 @@ sub df {
$pipe->reader(); $pipe->reader();
my $readvalues = sub { my $readvalues = sub {
$res->{total} = int((<$pipe> =~ /^(\d*)$/)[0]); $res->{total} = int(((<$pipe> // 0) =~ /^(\d*)$/)[0]);
$res->{used} = int((<$pipe> =~ /^(\d*)$/)[0]); $res->{used} = int(((<$pipe> // 0) =~ /^(\d*)$/)[0]);
$res->{avail} = int((<$pipe> =~ /^(\d*)$/)[0]); $res->{avail} = int(((<$pipe> // 0) =~ /^(\d*)$/)[0]);
}; };
eval { eval {
run_with_timeout($timeout, $readvalues); run_with_timeout($timeout, $readvalues);