X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=backup%2Ffull;h=fffbb1ace16bb2dd2cbf30342e0bbf543ef9ac45;hb=536539001bbafb42b6dc56a097d835c1afe1abcf;hp=388270fa62263687ba670caff4c671fb81374426;hpb=b0462536b814ddf1e337379dac850e745f4635dc;p=chiark-utils.git diff --git a/backup/full b/backup/full index 388270f..fffbb1a 100755 --- a/backup/full +++ b/backup/full @@ -30,12 +30,31 @@ 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 $?; + +openlog(); + +if (!$nocheck) { + setstatus "FAILED configuration check"; + print "Configuration check ...\n" or die $!; + system 'backup-checkallused'; $? and die $?; +} else { + setstatus "FAILED rewinding"; + rewind_raw(); +} printdate(); @@ -123,13 +142,14 @@ 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 $!; -setstatus "FAILED retensioning"; -system "mt -f $tape reten"; $? and die $?; +if (!$noreten) { + setstatus "FAILED retensioning"; + runsystem("mt -f $tape reten"); +} setstatus "FAILED writing tape ID"; # First write the tape ID to this tape. @@ -141,13 +161,15 @@ unlink 'this-md5sums'; print "Doing $doing ...\n" or die $!; unlink 'p'; -system 'mknod p p'; $? and die $?; +system 'mknod -m600 p p'; $? and die $?; 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 @@ -163,16 +185,32 @@ foreach $exc (@excl) { # For each filesystem to be put on this tape: for $tf (@fsys) { printdate(); + parsefsys(); + prepfsys(); + 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_print"); + # We can back up via dump or cpio or zafio + $dumpin= '&FINDOW',$rstr."find $atf -xdev -noleaf -print0"; $dumpcmd= "cpio -Hustar -o0C$softblocksizebytes"; @@ -183,22 +221,45 @@ 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"; + } elsif ($tm eq 'gtar') { + execute("$rstr touch $fsidfile+new"); + $dumpcmd= "tar Ccfl $atf - ."; } else { - die "unknown method $tm for $prefix:$atf\n"; + die "unknown method $tm for $prefix:$atf_print\n"; } # This is a funky way of doing a pipeline which pays attention # 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 += $1;
+ pboth("total blocks written so far: $totalrecords\n");
+
+ if ($tm eq 'gtar') {
+ execute("$rstr mv -f $fsidfile+new $fsidfile");
+ }
+
+ finfsys();
}
# The backup should now be complete; verify it
@@ -206,26 +267,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.