From: Alan J. Pippin <ajp@pippins.net>
Date: Tue, 11 Mar 2008 02:25:23 +0000 (-0600)
Subject: Fixed bug in parsing snapshot total logs
X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=commitdiff_plain;h=e868864af07febc5755735d451d74d9bc3ba170d;p=zfs-ubuntu%2F.git

Fixed bug in parsing snapshot total logs
---

diff --git a/zfs-log-parser b/zfs-log-parser
index 5c28003..dbb3c15 100755
--- a/zfs-log-parser
+++ b/zfs-log-parser
@@ -94,6 +94,7 @@ sub parse_snapshot_totals_logfile {
     $header="";
     while(<FILE>) {
 	$line = $_;
+        if($line =~ /logfile turned over/) { next; }
 	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;
@@ -103,10 +104,10 @@ sub parse_snapshot_totals_logfile {
 	    if(!defined $founddates{$date}) { $header .= $date . " "; }
 	    $founddates{$date} = 1;
 	}
-	if(($in_totals == 1) && ($line =~ /^\s+$/)) {
+	elsif(($in_totals == 1) && ($line =~ /^\s+$/)) {
 	    $in_totals = 0;
 	}
-	if(($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; }