diff --git a/Ceph/Script/cephDiskPerf.pl b/Ceph/Script/cephDiskPerf.pl index 19e5967fd90066e7a9ac34478388e2fc0d4b0a91..473e09dcd87405993675c79c16a287d6c429fa6b 100755 --- a/Ceph/Script/cephDiskPerf.pl +++ b/Ceph/Script/cephDiskPerf.pl @@ -174,14 +174,13 @@ foreach my $_lineS (@_dataSize) my $frac = $fields[7]; my $size = $fields[4]; $size =~ s/iB$//; + $size =~ s/B$//; my $sizeLastChar = lc(chop($size)); if ($sizeLastChar eq "t") { $size = $size * 1000.; - } elsif ($sizeLastChar eq "g") { - $size += 0.; - } else { - $size = $fields[4]; } + $size += 0.; + push (@{$dataSizeH{$size}}, $osdNum); push (@{$dataTypeH{$type}}, $osdNum); push (@{$fracSizeH{$size}}, $frac); diff --git a/Ceph/Script/queryCephDisks.pl b/Ceph/Script/queryCephDisks.pl index 5f24472267175ee44c70fbcf826961fddeb158dd..52575af154912bb799ded8b1c3769eac77142297 100755 --- a/Ceph/Script/queryCephDisks.pl +++ b/Ceph/Script/queryCephDisks.pl @@ -197,14 +197,13 @@ foreach my $_line (@_data) my $frac = $fields[7]; my $size = $fields[4]; $size =~ s/iB$//; + $size =~ s/B$//; my $sizeLastChar = lc(chop($size)); if ($sizeLastChar eq "t") { $size = $size * 1000.; - } elsif ($sizeLastChar eq "g") { - $size += 0.; - } else { - $size = $fields[4]; } + $size += 0.; + next unless ($size); push (@{$dataHash{$size}}, $osdNum); push (@{$typeHash{$type}}, $osdNum);