X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=backup%2Ffull;h=e23890d9dbb605b9ad69e664559cedb9abaaa84e;hp=02b5b0c60d89b41ba85a068335cf1e59af39dd5f;hb=314a202a6f4e0a120fd982ad0398cdf507d6219d;hpb=17fb3a3831ca812a3ad384f4eec3b977432facd9 diff --git a/backup/full b/backup/full index 02b5b0c..e23890d 100755 --- a/backup/full +++ b/backup/full @@ -30,21 +30,36 @@ BEGIN { $|=1; +while (@ARGV) { + $_= shift @ARGV; + if (m/^\-\-no\-reten$/) { + $noreten=1; + } elsif (m/^\-\-no\-config\-check$/) { + $nocheck=1; + } else { + die "unknown option/argument \`$_'\n"; + } +} + # Check to see whether the tape.nn and fsys.nn files are sane. # checkallused checks that all the filesystems mounted are in fact # dumped in both full and incremental dumps. -setstatus "FAILED configuration check"; -print "Configuration check ...\n" or die $!; -system 'backup-checkallused'; $? and die $?; + +if (!$nocheck) { + setstatus "FAILED configuration check"; + print "Configuration check ...\n" or die $!; + system 'backup-checkallused'; $? and die $?; +} else { + setstatus "FAILED rewinding"; + rewind_raw(); +} printdate(); setstatus "FAILED reading TAPEID"; # Try to read the tape ID from the tape into the file TAPEID -unlink 'TAPEID'; -system "mt -f $tape rewind"; $? and die $?; -system "mt -f $tape setblk $blocksizebytes"; $? and die $?; -system "dd if=$tape bs=${blocksize}b count=10 | tar -b$blocksize -vvxf - TAPEID"; + +readtapeid_raw(); setstatus "FAILED during startup"; @@ -130,14 +145,15 @@ 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 $?; +} + setstatus "FAILED writing tape ID"; # First write the tape ID to this tape. -open T, ">TAPEID" or die $!; -print T "$tapeid\n" or die $!; -close T or die $!; -system "tar -b$blocksize -vvcf TAPEID.tar TAPEID"; $? and die $?; -system "dd if=TAPEID.tar of=$ntape bs=${blocksize}b count=10"; $? and die $?; +writetapeid($tapeid,$tapedesc); unlink 'this-md5sums'; @@ -151,6 +167,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 @@ -166,16 +184,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 $!; - parsefsys(); + pipe(DDERRR,DDERRW) or die $!; + + $bufir='TEEOR'; + $ddcmd= "dd ibs=$softblocksizebytes obs=$blocksizebytes of=$ntape 2>&1"; + + if ($gz) { + $bufir='GZOR'; + pipe(GZOR,GZOW) or die $!; + $ddcmd .= " conv=sync"; + } + 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"; @@ -186,6 +218,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 -vvf --dirty $dev"; } else { die "unknown method $tm for $prefix:$atf\n"; } @@ -193,15 +227,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'; - startprocess '<&TEEOR','>&BUFOW','writebuffer'; - startprocess '<&BUFOR','>/dev/null' - ,"dd ibs=$softblocksizebytes obs=$blocksizebytes of=$ntape"; + # 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',"$nice gzip -v$gz"; + } + 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++; + pboth("total blocks written so far: $totalrecords"); } # The backup should now be complete; verify it @@ -216,9 +262,16 @@ system "mt -f $ntape fsf 1"; $? and die $?; open S,"this-md5sums" or die $!; for $tf (@fsys) { printdate(); - chomp($orgsum= ); + 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 $!; @@ -228,6 +281,13 @@ system "mt -f $tape rewind"; $? and die $?; setstatus "FAILED during cleanup"; +pboth("summary:"); +foreach $tfs (@tapefilesizes) { + pboth(sprintf " %10d blocks for %s\n", $tfs->[0], $tfs->[1]); +} +pboth(sprintf " %10d blocks total (of %d bytes) plus TAPEID and headers\n", + $totalrecords, $blocksizebytes); + # Write to some status files to indicate what the backup system # ought to do when next invoked. # reset incremental backup count to 1.