X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=bin%2FBackupPC_dump;h=d1e8384dad1c425ebc64bda6fa4f6c1cc00ac208;hp=8da28c34d9f1f5fbb6b617750284e009457454d4;hb=9cf3998c4ef71332dea96ff3115daf8b9f722acb;hpb=fadae1eaa5482a441bc8e8aa829a063ee6a5f0c0 diff --git a/bin/BackupPC_dump b/bin/BackupPC_dump index 8da28c3..d1e8384 100755 --- a/bin/BackupPC_dump +++ b/bin/BackupPC_dump @@ -1,11 +1,11 @@ -#!/bin/perl +#!/usr/bin/perl #============================================================= -*-perl-*- # # BackupPC_dump: Dump a single client. # # DESCRIPTION # -# Usage: BackupPC_dump [-i] [-f] [-d] [-e] [-v] +# Usage: BackupPC_dump [-i] [-f] [-F] [-I] [-d] [-e] [-v] # # Flags: # @@ -14,6 +14,13 @@ # # -f Do a full dump, overriding any scheduling. # +# -I Do an increment dump if the regular schedule requires a +# full or incremental, otherwise do nothing (a full is done +# if no dumps have yet succeeded) +# +# -F Do a full dump if the regular schedule requires a +# full or incremental, otherwise do nothing +# # -d Host is a DHCP pool address, and the client argument # just an IP address. We lookup the NetBios name from # the IP address. @@ -52,7 +59,7 @@ # Craig Barratt # # COPYRIGHT -# Copyright (C) 2001-2003 Craig Barratt +# Copyright (C) 2001-2009 Craig Barratt # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -70,7 +77,7 @@ # #======================================================================== # -# Version 3.1.0beta0, released 3 Sep 2007. +# Version 3.2.0beta0, released 5 April 2009. # # See http://backuppc.sourceforge.net. # @@ -82,10 +89,7 @@ use lib "/usr/local/BackupPC/lib"; use BackupPC::Lib; use BackupPC::FileZIO; use BackupPC::Storage; -use BackupPC::Xfer::Smb; -use BackupPC::Xfer::Tar; -use BackupPC::Xfer::Rsync; -use BackupPC::Xfer::BackupPCd; +use BackupPC::Xfer; use Encode; use Socket; use File::Path; @@ -108,14 +112,19 @@ my $Abort; $bpc->ChildInit(); my %opts; -if ( !getopts("defiv", \%opts) || @ARGV != 1 ) { - print("usage: $0 [-d] [-e] [-f] [-i] [-v] \n"); +if ( !getopts("defivFI", \%opts) || @ARGV != 1 ) { + print("usage: $0 [-d] [-e] [-f] [-i] [-F] [-I] [-v] \n"); exit(1); } if ( $ARGV[0] !~ /^([\w\.\s-]+)$/ ) { print("$0: bad client name '$ARGV[0]'\n"); exit(1); } +if ( (defined($opts{f}) + defined($opts{i}) + defined($opts{F}) + defined($opts{I})) > 1 ) { + print("$0: exiting because you can only use one of -f, -i, -F, and -I\n"); + exit(1); +} + my $client = $1; # BackupPC's client name (might not be real host name) my $hostIP; # this is the IP address my $host; # this is the real host name @@ -161,6 +170,7 @@ if ( !defined($Hosts->{$client}) ) { my $Dir = "$TopDir/pc/$client"; my @xferPid = (); my $tarPid = -1; +my $completionPercent; # # Re-read config file, so we can include the PC-specific config @@ -237,33 +247,6 @@ if ($Conf{XferMethod} eq "archive" ) { exit(0); } -if ( !$opts{d} ) { - # - # In the non-DHCP case, make sure the host can be looked up - # via NS, or otherwise find the IP address via NetBios. - # - if ( $Conf{ClientNameAlias} ne "" ) { - $host = $Conf{ClientNameAlias}; - } else { - $host = $client; - } - if ( !defined(gethostbyname($host)) ) { - # - # Ok, NS doesn't know about it. Maybe it is a NetBios name - # instead. - # - print(STDERR "Name server doesn't know about $host; trying NetBios\n") - if ( $opts{v} ); - if ( !defined($hostIP = $bpc->NetBiosHostIPFind($host)) ) { - print(LOG $bpc->timeStamp, "Can't find host $host via netbios\n"); - print("host not found\n"); - exit(1); - } - } else { - $hostIP = $host; - } -} - ########################################################################### # Figure out what to do and do it ########################################################################### @@ -303,6 +286,7 @@ my $lastFullTime = 0; my $lastIncrTime = 0; my $partialIdx = -1; my $partialNum; +my $partialFileCnt; my $lastBkupNum; my $lastPartial = 0; @@ -405,24 +389,31 @@ for ( my $i = 0 ; $i < @Backups ; $i++ ) { $lastIncrTime = $Backups[$i]{startTime} if ( $lastIncrTime < $Backups[$i]{startTime} ); } elsif ( $Backups[$i]{type} eq "partial" ) { - $partialIdx = $i; - $lastPartial = $Backups[$i]{startTime}; - $partialNum = $Backups[$i]{num}; + $partialIdx = $i; + $lastPartial = $Backups[$i]{startTime}; + $partialNum = $Backups[$i]{num}; + $partialFileCnt = $Backups[$i]{nFiles}; } } # # Decide whether we do nothing, or a full or incremental backup. # -if ( @Backups == 0 +my $needs_full = (time - $lastFullTime > $Conf{FullPeriod} * 24 * 3600 + && time - $lastIncrTime > $Conf{IncrPeriod} * 24 * 3600); +my $needs_incr = (time - $lastIncrTime > $Conf{IncrPeriod} * 24 * 3600 + && time - $lastFullTime > $Conf{IncrPeriod} * 24 * 3600); + +if ( $lastFullTime == 0 || $opts{f} - || (!$opts{i} && (time - $lastFullTime > $Conf{FullPeriod} * 24*3600 - && time - $lastIncrTime > $Conf{IncrPeriod} * 24*3600)) ) { + || (!$opts{i} && !$opts{I} && $needs_full) + || ( $opts{F} && $needs_incr) ) { $type = "full"; $incrLevel = 0; $incrBaseBkupNum = $lastBkupNum; -} elsif ( $opts{i} || (time - $lastIncrTime > $Conf{IncrPeriod} * 24*3600 - && time - $lastFullTime > $Conf{IncrPeriod} * 24*3600) ) { +} elsif ( $opts{i} + || $needs_incr + || ($opts{I} && $needs_full) ) { $type = "incr"; # # For an incremental backup, figure out which level we should @@ -456,6 +447,28 @@ if ( @Backups == 0 NothingToDo($needLink); } +# +# Create top-level directories if they don't exist +# +foreach my $dir ( ( + "$Conf{TopDir}", + "$Conf{TopDir}/pool", + "$Conf{TopDir}/cpool", + "$Conf{TopDir}/pc", + "$Conf{TopDir}/trash", + ) ) { + next if ( -d $dir ); + mkpath($dir, 0, 0750); + if ( !-d $dir ) { + print("Failed to create $dir\n"); + printf(LOG "%sFailed to create directory %s\n", $bpc->timeStamp, $dir); + print("link $clientURI\n") if ( $needLink ); + exit(1); + } else { + printf(LOG "%sCreated directory %s\n", $bpc->timeStamp, $dir); + } +} + if ( !$bpc->HardlinkTest($Dir, "$TopDir/cpool") ) { print(LOG $bpc->timeStamp, "Can't create a test hardlink between a file" . " in $Dir and $TopDir/cpool. Either these are different" @@ -469,6 +482,33 @@ if ( !$bpc->HardlinkTest($Dir, "$TopDir/cpool") ) { exit(1); } +if ( !$opts{d} ) { + # + # In the non-DHCP case, make sure the host can be looked up + # via NS, or otherwise find the IP address via NetBios. + # + if ( $Conf{ClientNameAlias} ne "" ) { + $host = $Conf{ClientNameAlias}; + } else { + $host = $client; + } + if ( !defined(gethostbyname($host)) ) { + # + # Ok, NS doesn't know about it. Maybe it is a NetBios name + # instead. + # + print(STDERR "Name server doesn't know about $host; trying NetBios\n") + if ( $opts{v} ); + if ( !defined($hostIP = $bpc->NetBiosHostIPFind($host)) ) { + print(LOG $bpc->timeStamp, "Can't find host $host via netbios\n"); + print("host not found\n"); + exit(1); + } + } else { + $hostIP = $host; + } +} + # # Check if $host is alive # @@ -564,17 +604,7 @@ my $sizeTotal = 0; my($logMsg, %stat, $xfer, $ShareNames, $noFilesErr); my $newFilesFH; -if ( $Conf{XferMethod} eq "tar" ) { - $ShareNames = $Conf{TarShareName}; -} elsif ( $Conf{XferMethod} eq "rsync" || $Conf{XferMethod} eq "rsyncd" ) { - $ShareNames = $Conf{RsyncShareName}; -} elsif ( $Conf{XferMethod} eq "backuppcd" ) { - $ShareNames = $Conf{BackupPCdShareName}; -} else { - $ShareNames = $Conf{SmbShareName}; -} - -$ShareNames = [ $ShareNames ] unless ref($ShareNames) eq "ARRAY"; +$ShareNames = BackupPC::Xfer::getShareNames(\%Conf); # # Run an optional pre-dump command @@ -583,8 +613,9 @@ UserCommandRun("DumpPreUserCmd"); if ( $? && $Conf{UserCmdCheckStatus} ) { print(LOG $bpc->timeStamp, "DumpPreUserCmd returned error status $?... exiting\n"); - print("dump failed: DumpPreUserCmd returned error status $?\n"); - exit(1); + $XferLOG->write(\"DumpPreUserCmd returned error status $?... exiting\n"); + $stat{hostError} = "DumpPreUserCmd returned error status $?"; + BackupFailCleanup(); } $NeedPostCmd = 1; @@ -610,45 +641,21 @@ for my $shareName ( @$ShareNames ) { if ( $? && $Conf{UserCmdCheckStatus} ) { print(LOG $bpc->timeStamp, "DumpPreShareCmd returned error status $?... exiting\n"); - print("dump failed: DumpPreShareCmd returned error status $?\n"); UserCommandRun("DumpPostUserCmd") if ( $NeedPostCmd ); - exit(1); + $XferLOG->write(\"DumpPreShareCmd returned error status $?... exiting\n"); + $stat{hostError} = "DumpPreShareCmd returned error status $?"; + BackupFailCleanup(); } - if ( $Conf{XferMethod} eq "tar" ) { - # - # Use tar (eg: tar/ssh) as the transport program. - # - $xfer = BackupPC::Xfer::Tar->new($bpc); - } elsif ( $Conf{XferMethod} eq "rsync" || $Conf{XferMethod} eq "rsyncd" ) { - # - # Use rsync as the transport program. - # - if ( !defined($xfer = BackupPC::Xfer::Rsync->new($bpc)) ) { - my $errStr = BackupPC::Xfer::Rsync::errStr; - print(LOG $bpc->timeStamp, "dump failed: $errStr\n"); - print("dump failed: $errStr\n"); - UserCommandRun("DumpPostShareCmd", $shareName) if ( $NeedPostCmd ); - UserCommandRun("DumpPostUserCmd") if ( $NeedPostCmd ); - exit(1); - } - } elsif ( $Conf{XferMethod} eq "backuppcd" ) { - # - # Use backuppcd as the transport program. - # - if ( !defined($xfer = BackupPC::Xfer::BackupPCd->new($bpc)) ) { - my $errStr = BackupPC::Xfer::BackupPCd::errStr; - print(LOG $bpc->timeStamp, "dump failed: $errStr\n"); - print("dump failed: $errStr\n"); - UserCommandRun("DumpPostShareCmd", $shareName) if ( $NeedPostCmd ); - UserCommandRun("DumpPostUserCmd") if ( $NeedPostCmd ); - exit(1); - } - } else { - # - # Default is to use smbclient (smb) as the transport program. - # - $xfer = BackupPC::Xfer::Smb->new($bpc); + $xfer = BackupPC::Xfer::create($Conf{XferMethod}, $bpc); + if ( !defined($xfer) ) { + my $errStr = BackupPC::Xfer::errStr(); + print(LOG $bpc->timeStamp, "dump failed: $errStr\n"); + UserCommandRun("DumpPostShareCmd", $shareName) if ( $NeedPostCmd ); + UserCommandRun("DumpPostUserCmd") if ( $NeedPostCmd ); + $XferLOG->write(\"BackupPC::Xfer::create failed: $errStr\n"); + $stat{hostError} = $errStr; + BackupFailCleanup(); } my $useTar = $xfer->useTar; @@ -738,14 +745,14 @@ for my $shareName ( @$ShareNames ) { compress => $Conf{CompressLevel}, XferMethod => $Conf{XferMethod}, logLevel => $Conf{XferLogLevel}, - pidHandler => \&pidHandler, partialNum => $partialNum, + pidHandler => \&pidHandler, + completionPercent => \&completionPercent, }); if ( !defined($logMsg = $xfer->start()) ) { - print(LOG $bpc->timeStamp, "xfer start failed: ", $xfer->errStr, "\n"); - print("dump failed: ", $xfer->errStr, "\n"); - print("link $clientURI\n") if ( $needLink ); + my $errStr = "xfer start failed: " . $xfer->errStr . "\n"; + print(LOG $bpc->timeStamp, $errStr); # # kill off the tar process, first nicely then forcefully # @@ -761,7 +768,9 @@ for my $shareName ( @$ShareNames ) { } UserCommandRun("DumpPostShareCmd", $shareName) if ( $NeedPostCmd ); UserCommandRun("DumpPostUserCmd") if ( $NeedPostCmd ); - exit(1); + $XferLOG->write(\"xfer start failed: $errStr\n"); + $stat{hostError} = $errStr; + BackupFailCleanup(); } @xferPid = $xfer->xferPid; @@ -787,43 +796,41 @@ for my $shareName ( @$ShareNames ) { # we use a select. # my($FDread, $tarOut, $mesg); - vec($FDread, fileno(TAR), 1) = 1 if ( $useTar ); + vec($FDread, fileno(TAR), 1) = 1; $xfer->setSelectMask(\$FDread); SCAN: while ( 1 ) { my $ein = $FDread; last if ( $FDread =~ /^\0*$/ ); select(my $rout = $FDread, undef, $ein, undef); - if ( $useTar ) { - if ( vec($rout, fileno(TAR), 1) ) { - if ( sysread(TAR, $mesg, 8192) <= 0 ) { - vec($FDread, fileno(TAR), 1) = 0; - close(TAR); - } else { - $tarOut .= $mesg; - } - } - while ( $tarOut =~ /(.*?)[\n\r]+(.*)/s ) { - $_ = $1; - $tarOut = $2; - if ( /^ / ) { - $XferLOG->write(\"$_\n"); - } else { - $XferLOG->write(\"tarExtract: $_\n"); - } - if ( /^BackupPC_tarExtact aborting \((.*)\)/ ) { - $stat{hostError} = $1; - } - if ( /^Done: (\d+) errors, (\d+) filesExist, (\d+) sizeExist, (\d+) sizeExistComp, (\d+) filesTotal, (\d+) sizeTotal/ ) { - $tarErrs += $1; - $nFilesExist += $2; - $sizeExist += $3; - $sizeExistComp += $4; - $nFilesTotal += $5; - $sizeTotal += $6; - } - } - } + if ( vec($rout, fileno(TAR), 1) ) { + if ( sysread(TAR, $mesg, 8192) <= 0 ) { + vec($FDread, fileno(TAR), 1) = 0; + close(TAR); + } else { + $tarOut .= $mesg; + } + } + while ( $tarOut =~ /(.*?)[\n\r]+(.*)/s ) { + $_ = $1; + $tarOut = $2; + if ( /^ / ) { + $XferLOG->write(\"$_\n"); + } else { + $XferLOG->write(\"tarExtract: $_\n"); + } + if ( /^BackupPC_tarExtact aborting \((.*)\)/ ) { + $stat{hostError} = $1; + } + if ( /^Done: (\d+) errors, (\d+) filesExist, (\d+) sizeExist, (\d+) sizeExistComp, (\d+) filesTotal, (\d+) sizeTotal/ ) { + $tarErrs += $1; + $nFilesExist += $2; + $sizeExist += $3; + $sizeExistComp += $4; + $nFilesTotal += $5; + $sizeTotal += $6; + } + } last if ( !$xfer->readOutput(\$FDread, $rout) ); while ( my $str = $xfer->logMsgGet ) { print(LOG $bpc->timeStamp, "xfer: $str\n"); @@ -985,6 +992,11 @@ my $newNum = BackupSave(); my $otherCount = $stat{xferErrCnt} - $stat{xferBadFileCnt} - $stat{xferBadShareCnt}; +$stat{fileCnt} ||= 0; +$stat{byteCnt} ||= 0; +$stat{xferErrCnt} ||= 0; +$stat{xferBadFileCnt} ||= 0; +$stat{xferBadShareCnt} ||= 0; print(LOG $bpc->timeStamp, "$type backup $newNum complete, $stat{fileCnt} files," . " $stat{byteCnt} bytes," @@ -1128,7 +1140,9 @@ sub BackupFailCleanup # # We keep this backup if it is a full and we actually backed - # up some files. + # up some files. If the prior backup was a partial too, we + # only keep this backup if it has more files than the previous + # partial. # if ( $type eq "full" ) { if ( $nFilesTotal == 0 && $xfer->getStats->{fileCnt} == 0 ) { @@ -1137,13 +1151,29 @@ sub BackupFailCleanup # directory just in case. # find(\&CheckForNewFiles, "$Dir/new"); - $keepPartial = 1 if ( $nFilesTotal ); - } else { - # - # Xfer reported some files - # + } + my $str; + if ( $nFilesTotal > $partialFileCnt + || $xfer->getStats->{fileCnt} > $partialFileCnt ) { + # + # If the last backup wasn't a partial then + # $partialFileCnt is undefined, so the above + # test is simply $nFilesTotal > 0 + # $keepPartial = 1; - } + if ( $partialFileCnt ) { + $str = "Saving this as a partial backup\n"; + } else { + $str = sprintf("Saving this as a partial backup, replacing the" + . " prior one (got %d and %d files versus %d)\n", + $nFilesTotal, $xfer->getStats->{fileCnt}, $partialFileCnt); + } + } else { + $str = sprintf("Not saving this as a partial backup since it has fewer" + . " files than the prior one (got %d and %d files versus %d)\n", + $nFilesTotal, $xfer->getStats->{fileCnt}, $partialFileCnt); + } + $XferLOG->write(\$str); } # @@ -1558,7 +1588,7 @@ sub CorrectHostCheck || $Conf{NmbLookupCmd} eq "" ); my($netBiosHost, $netBiosUser) = $bpc->NetBiosInfoGet($hostIP); return "host $host has mismatching netbios name $netBiosHost" - if ( $netBiosHost ne $host ); + if ( lc($netBiosHost) ne lc(substr($host, 0, 15)) ); return; } @@ -1579,6 +1609,23 @@ sub pidHandler print("xferPids $str\n"); } +# +# The Xfer method might tell us from time to time about progress +# in the backup or restore +# +sub completionPercent +{ + my($percent) = @_; + + $percent = 100 if ( $percent > 100 ); + $percent = 0 if ( $percent < 0 ); + if ( !defined($completionPercent) + || int($completionPercent + 0.5) != int($percent) ) { + printf("completionPercent %.0f\n", $percent); + } + $completionPercent = $percent; +} + # # Run an optional pre- or post-dump command # @@ -1622,6 +1669,7 @@ sub UserCommandRun $bpc->cmdSystemOrEval($cmd, sub { $XferLOG->write(\$_[0]); + print(LOG $bpc->timeStamp, "Output from $cmdType: ", $_[0]); }, $vars, \%Conf); }