Use expect_empty_remote_list flag when checking if remote list should be empty or not

[zfs-ubuntu/.git] / zfs-log-parser

diff --git a/zfs-log-parser b/zfs-log-parser
index 94e4490b500a581b623dc6daa681eabb4e1735ff..560cba229fe6543afd968ac881118e98532ee5cd 100755 (executable)
--- a/zfs-log-parser
+++ b/zfs-log-parser
@@ -66,9 +66,9 @@ sub parse_replicate_logfile {
        }   
        if(($in_replicate == 1) && ($line =~ /received ([\d\.]+)(\w+)/)) {
            $data = $1; $size = $2;
-           if($size =~ /Kb/i) { $data = $data * $kilo; }
-           if($size =~ /Mb/i) { $data = $data * $mega; }
-           if($size =~ /Gb/i) { $data = $data * $giga; }
+           if($size =~ /(Kb|K)/i) { $data = $data * $kilo; }
+           if($size =~ /(Mb|M)/i) { $data = $data * $mega; }
+           if($size =~ /(Gb|G)/i) { $data = $data * $giga; }
            chomp($line);
            $totals{$date}{data} += $data;
        }
@@ -117,7 +117,7 @@ sub parse_snapshot_totals_logfile {
        elsif(($in_totals == 1) && ($line =~ /(\S+)\s+([\d\.]*)(\w+)\s+(\d+)/)) {
            $filesystem = $1; $data = $2; $size = $3; $num_snaps = $4;
            if($filesystem =~ /Snapshots/ || $filesystem =~ /Total/) { next; }
-           if($filesystem =~ /$backup_pool/) { next; }
+           if($filesystem =~ /^$backup_pool/) { next; }
            if(length($filesystem) > $maxlen) { $maxlen = length($filesystem); }
            if($size =~ /K/i) { $data = $data * $kilo; }
            if($size =~ /M/i) { $data = $data * $mega; }