X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=zfs-log-parser;h=f13c2a01dfa2454940421c9aec909dcef3b5e38e;hb=HEAD;hp=dbb3c15a88a8e533a05ad30593c35755d84a0c7b;hpb=e868864af07febc5755735d451d74d9bc3ba170d;p=zfs-nexenta%2F.git

diff --git a/zfs-log-parser b/zfs-log-parser
index dbb3c15..f13c2a0 100755
--- a/zfs-log-parser
+++ b/zfs-log-parser
@@ -52,14 +52,14 @@ sub parse_replicate_logfile {
 	if(($in_replicate == 0) && ("$startdate" ne "") && ($line !~ /$startdate/)) { next; }
 	if($line =~ /(\S+)\s+(\S+)\s+(\d+)\s+(\d+):(\d+):(\d+)\s+(\S+)\s+(\S+)/) {
 	    $dayname=$1; $month=$2; $daynum=$3; $hour=$4; $minute=$5; $sec=$6; $year=$8;
-	    if(($in_replicate == 0) && ($line =~ /lock obtained/)) {
+	    if(($in_replicate == 0) && ($line =~ /replicate started/)) {
 		$in_replicate = 1;
 		$date="$dayname $month $daynum $hour:$minute:$sec $year";
 		$totals{$date}{data} = 0;
 		$totals{$date}{transfertime} = 0;
 		$totals{$date}{duration} = time_to_seconds($hour,$minute,$sec);
 	    }
-	    elsif(($in_replicate == 1) && ($line=~ /lock released/)) {
+	    elsif(($in_replicate == 1) && ($line=~ /replicate complete/)) {
 		$in_replicate = 0;
 		$totals{$date}{duration} = time_to_seconds($hour,$minute,$sec) - $totals{$date}{duration};
 	    }
@@ -82,7 +82,11 @@ sub parse_replicate_logfile {
 	$duration=adjust_duration($totals{$date}{duration});
 	$data=adjust_data($totals{$date}{data});
 	$transfertime=adjust_duration($totals{$date}{transfertime});
-	$rate = adjust_data(int($totals{$date}{data}/$totals{$date}{transfertime}));
+        if($totals{$date}{transfertime} > 0) { 
+	  $rate = adjust_data(int($totals{$date}{data}/$totals{$date}{transfertime}));
+        } else { 
+          $rate = 0;
+        }
 	print "$date: data=${data} transfertime=$transfertime rate=${rate}/sec duration=$duration\n";
     }
 }
@@ -91,10 +95,13 @@ sub parse_snapshot_totals_logfile {
     %totals=();
     $in_totals=0;
     $maxlen=0;
+    $found_startdate=0;
     $header="";
     while(<FILE>) {
 	$line = $_;
         if($line =~ /logfile turned over/) { next; }
+        if(($in_totals == 0) && ("$startdate" ne "") && ($line !~ /$startdate/) && ($found_startdate==0)) { next; }
+        if(($in_totals == 0) && ("$startdate" ne "") && ($line =~ /$startdate/) && ($found_startdate==0)) { $found_startdate=1; }
 	if(($in_totals == 0) && ($line =~ /(\S+)\s+(\S+)\s+(\d+)\s+(\d+):(\d+):(\d+)\s+(\S+)\s+(\S+)/)) {
 	    $dayname=$1; $month=$2; $daynum=$3; $hour=$4; $minute=$5; $sec=$6; $year=$8;
 	    $in_totals = 1;
@@ -107,10 +114,10 @@ sub parse_snapshot_totals_logfile {
 	elsif(($in_totals == 1) && ($line =~ /^\s+$/)) {
 	    $in_totals = 0;
 	}
-	elsif(($in_totals == 1) && ($line =~ /(\S+)\s+([\d\.]+)(\w+)\s+(\d+)/)) {
+	elsif(($in_totals == 1) && ($line =~ /(\S+)\s+([\d\.]*)(\w+)\s+(\d+)/)) {
 	    $filesystem = $1; $data = $2; $size = $3; $num_snaps = $4;
-	    if($filesystem =~ /Snapshots/) { next; }
-	    if($filesystem =~ /$backup_pool/) { next; }
+	    if($filesystem =~ /Snapshots/ || $filesystem =~ /Total/) { 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; }
@@ -129,6 +136,7 @@ sub parse_snapshot_totals_logfile {
 	foreach $date (sort keys %$hashref) {
 	    if($date !~ /(\d+)-(\d+)-(\d+)/) { next; }
 	    $date_data=adjust_data($totals{$filesystem}{$date}{data});
+            if($date_data eq "") { $date_data = "0"; }
 	    $data .= sprintf("%10s",$date_data). " ";
 	    $date_totals{$date}{data} += $totals{$filesystem}{$date}{data};
 	}
@@ -151,7 +159,11 @@ sub parse_snapshot_totals_logfile {
 # MAIN
 #########
 #print "-> Parsing $logfile\n";
-open(FILE,"$logfile") || die "-E- Unable to open $logfile\n";
+if("$logfile" =~ /\.[bz2|gz]/) { 
+  open(FILE,"zcat $logfile|") || die "-E- Unable to open $logfile\n";
+} else {
+  open(FILE,"$logfile") || die "-E- Unable to open $logfile\n";
+}
 
 if($logfile =~ /replicate/) { parse_replicate_logfile(); }
 if($logfile =~ /snapshot-totals/) { parse_snapshot_totals_logfile(); }