summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
e471eed)
* ntfsimage support.
* fix writebuffer's progname.
* fix reporting of unaccountable filesystems.
+ * A little less clone-and-hack.
+ * Count and display on-tape file numbers.
+ * Count output blocks for each tape file and in total.
- -- Ian Jackson <ian@davenant.greenend.org.uk> Sun, 11 May 2003 20:36:20 +0100
+ --
chiark-utils (3.0.3) unstable; urgency=low
would be nice someday
---------------------
would be nice someday
---------------------
-record file number
-record bytes written
increms after fulls
replace loaded with idformat
read/writebuffer setuid --mlock
whatsthis no cloneandhack
increms after fulls
replace loaded with idformat
read/writebuffer setuid --mlock
whatsthis no cloneandhack
whatsthis listing for zafio and dump archives
configuration files autogenerator
whatsthis listing for zafio and dump archives
configuration files autogenerator
"| tar -b$blocksize -vvxf - TAPEID";
}
"| tar -b$blocksize -vvxf - TAPEID";
}
+sub pboth ($) {
+ my ($str) = @_;
+ print LOG $str or die $!;
+ print $str or die $!;
+}
+
+sub nexttapefile ($) {
+ my ($what) = @_;
+ $currenttapefilenumber++;
+ $currenttapefilename= $what;
+ pboth(sprintf "writing tape file #%d (mt fsf %d): %s",
+ $currenttapefilenumber, $currenttapefilenumber-1, $what);
+}
+
sub writetapeid ($$) {
open T, ">TAPEID" or die $!;
print T "$_[0]\n$_[1]\n" or die $!;
close T or die $!;
sub writetapeid ($$) {
open T, ">TAPEID" or die $!;
print T "$_[0]\n$_[1]\n" or die $!;
close T or die $!;
+ $currenttapefilenumber= 0;
+ nexttapefile('TAPEID');
+
system "tar -b$blocksize -vvcf TAPEID.tar TAPEID"; $? and die $?;
system "dd if=TAPEID.tar of=$ntape bs=${blocksize}b count=10";
$? and 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 $?;
delete $processes{$p};
$? && die "error: command gave code $?: $c\n";
}
delete $processes{$p};
$? && die "error: command gave code $?: $c\n";
}
- print LOG " ok\n" or die $!;
- print " ok\n" or die $!;
close(DUMPOR); close(TEEOR); close(BUFOR); close(FINDOR);
close(DUMPOW); close(TEEOW); close(BUFOW); close(FINDOW);
close(GZOR); close(GZOW);
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
}
# work out a find option string that will exclude the required files
pipe(FINDOR,FINDOW) or die $!;
pipe(DUMPOR,DUMPOW) or die $!;
pipe(TEEOR,TEEOW) or die $!;
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(BUFOR,BUFOW) or die $!;
+ pipe(DDERRR,DDERRW) or die $!;
- $ddcmd= "dd ibs=$softblocksizebytes obs=$blocksizebytes of=$ntape";
+ $ddcmd= "dd ibs=$softblocksizebytes obs=$blocksizebytes of=$ntape 2>&1";
if ($gz) {
$bufir='GZOR';
if ($gz) {
$bufir='GZOR';
$ddcmd .= " conv=sync";
}
$ddcmd .= " conv=sync";
}
+ nexttapefile("full $prefix:$atf");
+
# We can back up via dump or cpio or zafio
$dumpin= '</dev/null';
if ($tm eq 'dump') {
# We can back up via dump or cpio or zafio
$dumpin= '</dev/null';
if ($tm eq 'dump') {
# It is roughly equivalent to:
# md5sum <p >>this-md5sums
# dump <$dumpin | tee p [| gzip] | writebuffer | dd >/dev/null
# It is roughly equivalent to:
# md5sum <p >>this-md5sums
# dump <$dumpin | tee p [| gzip] | writebuffer | dd >/dev/null
startprocess '<p','>>this-md5sums',"$nice md5sum";
startprocess $dumpin,'>&DUMPOW',"$nice ".$rstr.$dumpcmd;
startprocess '<&DUMPOR','>&TEEOW',"$nice tee p";
startprocess '<p','>>this-md5sums',"$nice md5sum";
startprocess $dumpin,'>&DUMPOW',"$nice ".$rstr.$dumpcmd;
startprocess '<&DUMPOR','>&TEEOW',"$nice tee p";
startprocess '<&TEEOR','>&GZOW',"$nice gzip -v$gz";
}
startprocess "<&$bufir",'>&BUFOW',"$nasty writebuffer";
startprocess '<&TEEOR','>&GZOW',"$nice gzip -v$gz";
}
startprocess "<&$bufir",'>&BUFOW',"$nasty writebuffer";
- startprocess '<&BUFOR','>/dev/null',"$nasty $ddcmd";
+ startprocess '<&DDERRR','>/dev/null',"$nice tee dderr >&2";
+ startprocess '<&BUFOR','>&DDERRW',"$nasty $ddcmd";
closepipes();
endprocesses();
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
}
# The backup should now be complete; verify it
$cmd .= " | $nasty readbuffer";
$cmd .= " | $nice gzip -vd" if $gz;
$cmd .= " | $nice md5sum";
$cmd .= " | $nasty readbuffer";
$cmd .= " | $nice gzip -vd" if $gz;
$cmd .= " | $nice md5sum";
- print LOG " $cmd\n" or die $!;
- print " $cmd\n" or die $!;
chomp($csum= `$cmd`);
$csum =~ s/\ +\-?$//;
$orgsum eq $csum or die "MISMATCH $tf $csum $orgsum\n";
chomp($csum= `$cmd`);
$csum =~ s/\ +\-?$//;
$orgsum eq $csum or die "MISMATCH $tf $csum $orgsum\n";
setstatus "FAILED during cleanup";
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.
# Write to some status files to indicate what the backup system
# ought to do when next invoked.
# reset incremental backup count to 1.
# it invoked us, so no need to read the existing TAPEID record first.)
system "mt -f $ntape rewind"; $? and die $?;
if ($advance == 1) {
# it invoked us, so no need to read the existing TAPEID record first.)
system "mt -f $ntape rewind"; $? and die $?;
if ($advance == 1) {
- open TI,">TAPEID" or die $!;
- print TI "$tapeid\n$tapedesc\n" or die $!;
- close TI 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);
} else {
system "mt -f $ntape fsf $advance"; $? and die $?;
} else {
system "mt -f $ntape fsf $advance"; $? and die $?;
+ $currenttapefilenumber= $advance+1;
}
# Get a list of all filesystems
}
# Get a list of all filesystems
print LOG "Not dumping $atf ($prefix) - not \`dump'.\n" or die $!;
next;
}
print LOG "Not dumping $atf ($prefix) - not \`dump'.\n" or die $!;
next;
}
+
+ nexttapefile("inc $prefix:$atf");
+
# Same trick as full uses to do a pipeline whilst keeping track
# of all exit statuses:
# dump </dev/null | writebuffer | dd >/dev/null
# Same trick as full uses to do a pipeline whilst keeping track
# of all exit statuses:
# dump </dev/null | writebuffer | dd >/dev/null
* ntfsimage support.
* fix writebuffer's progname.
* fix reporting of unaccountable filesystems.
* ntfsimage support.
* fix writebuffer's progname.
* fix reporting of unaccountable filesystems.
+ * A little less clone-and-hack.
+ * Count and display on-tape file numbers.
+ * Count output blocks for each tape file and in total.
- -- Ian Jackson <ian@davenant.greenend.org.uk> Sun, 11 May 2003 20:36:20 +0100
+ -- Ian Jackson <ian@davenant.greenend.org.uk> Sun, 11 May 2003 21:11:49 +0100
chiark-utils (3.0.3) unstable; urgency=low
chiark-utils (3.0.3) unstable; urgency=low