X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=backup%2Ffull;h=a46726077e414ff1275606931562672a82b4024c;hp=784d302335e3c3653c6e484cab95fed8125281d4;hb=119eed72570e87be84e04aece002c458028149ca;hpb=c9864d70f390dc1e16c7f1d744f15a2a008f5ce8 diff --git a/backup/full b/backup/full index 784d302..a467260 100755 --- a/backup/full +++ b/backup/full @@ -45,6 +45,8 @@ while (@ARGV) { # checkallused checks that all the filesystems mounted are in fact # dumped in both full and incremental dumps. +openlog(); + if (!$nocheck) { setstatus "FAILED configuration check"; print "Configuration check ...\n" or die $!; @@ -140,14 +142,13 @@ if ($incremental) { # Read the filesystem group definition (file fsys.nnn) readfsys("$fsys"); -openlog(); $doing= "dump of $fsys to tape $tapedesc in drive $tape"; print LOG "$doing:\n" or die $!; if (!$noreten) { setstatus "FAILED retensioning"; - system "mt -f $tape reten"; $? and die $?; + runsystem("mt -f $tape reten"); } setstatus "FAILED writing tape ID"; @@ -167,6 +168,8 @@ setstatus "FAILED during dump"; sub closepipes () { close(DUMPOR); close(TEEOR); close(BUFOR); close(FINDOR); close(DUMPOW); close(TEEOW); close(BUFOW); close(FINDOW); + close(GZOR); close(GZOW); + close(DDERRR); close(DDERRW); } # work out a find option string that will exclude the required files @@ -182,32 +185,30 @@ foreach $exc (@excl) { # For each filesystem to be put on this tape: for $tf (@fsys) { printdate(); + parsefsys(); + pipe(FINDOR,FINDOW) or die $!; pipe(DUMPOR,DUMPOW) or die $!; pipe(TEEOR,TEEOW) or die $!; + pipe(TEEOR,TEEOW) or die $!; + pipe(BUFOR,BUFOW) or die $!; + pipe(DDERRR,DDERRW) or die $!; + $bufir='TEEOR'; + $ddcmd= "dd ibs=$softblocksizebytes obs=$blocksizebytes of=$ntape 2>&1"; - if ($dopt{'gz'} eq 'y') { - $gz= '3'; - } elsif ($dopt{'gz'} =~ m/^\d$/) { - $gz= $dopt{'gz'}; - } elsif (defined $dopt{'gz'}) { - die "$tf bad gz"; - } else { - $gz= 0; - } if ($gz) { $bufir='GZOR'; pipe(GZOR,GZOW) or die $!; + $ddcmd .= " conv=sync"; } - pipe(BUFOR,BUFOW) or die $!; - parsefsys(); - + nexttapefile("full $prefix:$atf"); + # We can back up via dump or cpio or zafio + $dumpin= '&FINDOW',$rstr."find $atf -xdev -noleaf -print0"; $dumpcmd= "cpio -Hustar -o0C$softblocksizebytes"; @@ -218,6 +219,8 @@ for $tf (@fsys) { # don't use verbose flag as this generates 2MB report emails :-> $dumpcmd = "afio -b $softblocksizebytes -Zo -"; $dumpin = '<&FINDOR'; + } elsif ($tm eq 'ntfsimage') { + $dumpcmd= "ntfsimage -svvf --dirty $dev"; } else { die "unknown method $tm for $prefix:$atf\n"; } @@ -225,18 +228,27 @@ for $tf (@fsys) { # to the exit status of all the commands in the pipeline. # It is roughly equivalent to: # md5sum

>this-md5sums - # dump <$dumpin | tee p | writebuffer | dd >/dev/null - startprocess '>this-md5sums','md5sum'; - startprocess $dumpin,'>&DUMPOW',$rstr.$dumpcmd; - startprocess '<&DUMPOR','>&TEEOW','tee p'; + # dump <$dumpin | tee p [| gzip] | writebuffer | dd >/dev/null + + startprocess '>this-md5sums',"$nice md5sum"; + startprocess $dumpin,'>&DUMPOW',"$nice ".$rstr.$dumpcmd; + startprocess '<&DUMPOR','>&TEEOW',"$nice tee p"; if ($gz) { - startprocess '<&TEEOR','>&GZOW','gzip -v$gz'; + startprocess '<&TEEOR','>&GZOW',"$nice gzip -v$gz"; } - startprocess "<&$bufir",'>&BUFOW','writebuffer'; - startprocess '<&BUFOR','>/dev/null' - ,"dd ibs=$softblocksizebytes obs=$blocksizebytes of=$ntape"; + startprocess "<&$bufir",'>&BUFOW',"$nasty writebuffer"; + startprocess '<&DDERRR','>/dev/null',"$nice tee dderr >&2"; + startprocess '<&BUFOR','>&DDERRW',"$nasty $ddcmd"; closepipes(); endprocesses(); + + open DDERR, "dderr" or die $!; + defined(read DDERR,$_,1023) or die $!; + close DDERR; + m/\n(\d+)\+0 records out\n/ or die ">$dderr< ?"; + push @tapefilesizes, [ $1, $currenttapefilename ]; + $totalrecords += $1; + pboth("total blocks written so far: $totalrecords\n"); } # The backup should now be complete; verify it @@ -244,26 +256,48 @@ for $tf (@fsys) { setstatus "FAILED during check"; # Rewind the tape and skip the TAPEID record -system "mt -f $tape rewind"; $? and die $?; -system "mt -f $ntape fsf 1"; $? and die $?; +runsystem("mt -f $tape rewind"); +runsystem("mt -f $ntape fsf 1"); # Check the md5sums match for each filesystem on the tape open S,"this-md5sums" or die $!; for $tf (@fsys) { printdate(); + parsefsys(); chomp($orgsum= ); $orgsum =~ s/\ +\-?$//; $orgsum =~ m/^[0-9a-fA-F]{32}$/i or die "orgsum \`$orgsum' ?"; - chomp($csum= `dd if=$ntape ibs=$blocksizebytes | readbuffer | md5sum`); + $cmd= "$nasty dd if=$ntape ibs=$blocksizebytes"; + $cmd .= " | $nasty readbuffer"; + $cmd .= " | $nice gzip -vd" if $gz; + $cmd .= " | $nice md5sum"; + pboth(" $cmd\n"); + chomp($csum= `$cmd`); $csum =~ s/\ +\-?$//; $orgsum eq $csum or die "MISMATCH $tf $csum $orgsum\n"; print "checksum ok $csum\t$tf\n" or die $!; print LOG "checksum ok $csum\t$tf\n" or die $!; } printdate(); -system "mt -f $tape rewind"; $? and die $?; +runsystem("mt -f $tape rewind"); setstatus "FAILED during cleanup"; +$summary= ''; +foreach $tfs (@tapefilesizes) { + $summary .= sprintf " %10d blocks for %s\n", $tfs->[0], $tfs->[1] +} +$summary .= + sprintf " %10d blocks total (of %d bytes) plus TAPEID and headers\n", + $totalrecords, $blocksizebytes; + +pboth("size-summary:\n"); +pboth($summary); + +open SS, ">size-summary..new" or die $!; +print SS $summary or die $!; +close SS or die $!; +rename 'size-summary..new',"size-summary.$fsys" or die $!; + # Write to some status files to indicate what the backup system # ought to do when next invoked. # reset incremental backup count to 1.