rbd: fix rados df parser for luminous

2017-03-21 10:11:42 +01:00
parent da5a54891e
commit c59a0f2452
1 changed files with 5 additions and 1 deletions
--- a/PVE/Storage/RBDPlugin.pm
+++ b/PVE/Storage/RBDPlugin.pm
@ -537,8 +537,12 @@ sub status {

    my $parser = sub {
 	my $line = shift;
-	if ($line =~ m/^\s+total\s(\S+)\s+(\d+)/) {
+	if ($line =~ m/^\s*total(?:\s|_)(\S+)\s+(\d+)(k|M|G|T)?/) {
 	    $stats->{$1} = $2;
+	    # luminous has units here..
+	    if ($3) {
+		$stats->{$1} *= $rbd_unittobytes->{$3}/1024;
+	    }
 	}
    };