X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=bin%2FBackupPC;h=bec909d2e161462a6c600f9d7752bacd9a3bd89e;hb=e4a233559926fe41888b2f6c5cc716401b715162;hp=964640e4178df97d7bad7d50ad0d5a45d6ee82dd;hpb=3dc33e5f39430031766adf3c5bb2ffc649ee9100;p=BackupPC.git diff --git a/bin/BackupPC b/bin/BackupPC index 964640e..bec909d 100755 --- a/bin/BackupPC +++ b/bin/BackupPC @@ -47,7 +47,7 @@ # #======================================================================== # -# Version 1.6.0_CVS, released 10 Dec 2002. +# Version 2.0.0beta2, released 13 Apr 2003. # # See http://backuppc.sourceforge.net. # @@ -70,8 +70,7 @@ use Digest::MD5; # Handle command line options ########################################################################### my %opts; -getopts("d", \%opts); -if ( @ARGV != 0 ) { +if ( !getopts("d", \%opts) || @ARGV != 0 ) { print("usage: $0 [-d]\n"); exit(1); } @@ -249,8 +248,8 @@ sub Main_Initialize exit(1); } foreach my $progName ( qw(SmbClientPath NmbLookupPath PingPath DfPath - SendmailPath) ) { - next if ( !defined($Conf{$progName}) || -x $Conf{$progName} ); + SendmailPath SshPath) ) { + next if ( $Conf{$progName} eq "" || -x $Conf{$progName} ); print(STDERR $bpc->timeStamp, "\$Conf{$progName} = '$Conf{$progName}' is not a" . " valid executable program\n"); @@ -320,12 +319,16 @@ sub Main_Initialize } $Status{$host}{activeJob} = 0; } + foreach my $host ( sort(keys(%Status)) ) { + next if ( defined($Hosts->{$host}) ); + delete($Status{$host}); + } # # Write out our initial status and save our PID # StatusWrite(); - if ( open(PID, ">$TopDir/log/BackupPC.pid") ) { + if ( open(PID, ">", "$TopDir/log/BackupPC.pid") ) { print(PID $$); close(PID); } @@ -364,7 +367,7 @@ sub Main_TryToRun_nightly host => $bpc->trashJob, user => "BackupPC", reqTime => time, - cmd => "$BinDir/BackupPC_trashClean" + cmd => ["$BinDir/BackupPC_trashClean"], }); $CmdQueueOn{$bpc->trashJob} = 1; } @@ -373,7 +376,7 @@ sub Main_TryToRun_nightly host => $bpc->adminJob, user => "BackupPC", reqTime => time, - cmd => "$BinDir/BackupPC_nightly" + cmd => ["$BinDir/BackupPC_nightly"], }); $CmdQueueOn{$bpc->adminJob} = 1; $RunNightlyWhenIdle = 2; @@ -420,8 +423,8 @@ sub Main_TryToRun_CmdQueue } if ( !$pid ) { setpgrp 0,0; - exec($cmd); - print(LOG $bpc->timeStamp, "can't exec $cmd for $host\n"); + exec(@$cmd); + print(LOG $bpc->timeStamp, "can't exec @$cmd for $host\n"); exit(0); } $Jobs{$host}{pid} = $pid; @@ -430,6 +433,7 @@ sub Main_TryToRun_CmdQueue vec($FDread, $Jobs{$host}{fn}, 1) = 1; $Jobs{$host}{startTime} = time; $Jobs{$host}{reqTime} = $req->{reqTime}; + $cmd = join(" ", @$cmd); $Jobs{$host}{cmd} = $cmd; $Jobs{$host}{type} = $Status{$host}{type}; $Status{$host}{state} = "Status_link_running"; @@ -560,9 +564,12 @@ sub Main_TryToRun_Bg_or_User_Queue vec($FDread, $Jobs{$host}{fn}, 1) = 1; $Jobs{$host}{startTime} = time; $Jobs{$host}{reqTime} = $req->{reqTime}; - $Jobs{$host}{cmd} = "$progName " . join(" ", @args); + $Jobs{$host}{userReq} = $req->{userReq}; + $Jobs{$host}{cmd} = join(" ", $progName, @args); $Jobs{$host}{user} = $user; $Jobs{$host}{type} = $type; + $Status{$host}{userReq} = $req->{userReq} + if ( defined($Hosts->{$host}) ); if ( !$req->{dhcp} ) { $Status{$host}{state} = "Status_".$type."_starting"; $Status{$host}{activeJob} = 1; @@ -775,7 +782,7 @@ sub Main_Check_Job_Messages $Jobs{$host}{mesg} = $2; if ( $Jobs{$host}{dhcp} ) { if ( $mesg =~ /^DHCP (\S+) (\S+)/ ) { - my $newHost = $2; + my $newHost = $bpc->uriUnesc($2); if ( defined($Jobs{$newHost}) ) { print(LOG $bpc->timeStamp, "Backup on $newHost is already running\n"); @@ -796,16 +803,11 @@ sub Main_Check_Job_Messages } else { print(LOG $bpc->timeStamp, "dhcp $host: $mesg\n"); } - } elsif ( $mesg =~ /^started (.*) dump, pid=(-?\d+), tarPid=(-?\d+), share=(.*)/ ) { + } elsif ( $mesg =~ /^started (.*) dump, share=(.*)/ ) { $Jobs{$host}{type} = $1; - $Jobs{$host}{xferPid} = $2; - $Jobs{$host}{tarPid} = $3; - $Jobs{$host}{shareName} = $4; + $Jobs{$host}{shareName} = $2; print(LOG $bpc->timeStamp, - "Started $1 backup on $host" - . " (pid=$Jobs{$host}{pid}, xferPid=$2", - $Jobs{$host}{tarPid} > 0 - ? ", tarPid=$Jobs{$host}{tarPid}" : "", + "Started $1 backup on $host (pid=$Jobs{$host}{pid}", $Jobs{$host}{dhcpHostIP} ? ", dhcp=$Jobs{$host}{dhcpHostIP}" : "", ", share=$Jobs{$host}{shareName})\n"); @@ -817,16 +819,13 @@ sub Main_Check_Job_Messages $Status{$host}{aliveCnt}++; $Status{$host}{dhcpCheckCnt}-- if ( $Status{$host}{dhcpCheckCnt} > 0 ); - } elsif ( $mesg =~ /^started_restore (\S+) (\S+)/ ) { - $Jobs{$host}{type} = "restore"; + } elsif ( $mesg =~ /^xferPids (.*)/ ) { $Jobs{$host}{xferPid} = $1; - $Jobs{$host}{tarPid} = $2; + } elsif ( $mesg =~ /^started_restore/ ) { + $Jobs{$host}{type} = "restore"; print(LOG $bpc->timeStamp, "Started restore on $host" - . " (pid=$Jobs{$host}{pid}, xferPid=$2", - $Jobs{$host}{tarPid} > 0 - ? ", tarPid=$Jobs{$host}{tarPid}" : "", - ")\n"); + . " (pid=$Jobs{$host}{pid})\n"); $Status{$host}{state} = "Status_restore_in_progress"; $Status{$host}{reason} = ""; $Status{$host}{type} = "restore"; @@ -852,10 +851,14 @@ sub Main_Check_Job_Messages $Status{$host}{dhcpCheckCnt}-- if ( $Status{$host}{dhcpCheckCnt} > 0 ); } elsif ( $mesg =~ /^no ping response/ - || $mesg =~ /^ping too slow/ ) { + || $mesg =~ /^ping too slow/ + || $mesg =~ /^host not found/ ) { $Status{$host}{state} = "Status_idle"; - if ( $Status{$host}{reason} ne "Reason_backup_failed" ) { + if ( $Status{$host}{userReq} + || $Status{$host}{reason} ne "Reason_backup_failed" + || $Status{$host}{error} =~ /^aborted by user/ ) { $Status{$host}{reason} = "Reason_no_ping"; + $Status{$host}{error} = $mesg; $Status{$host}{startTime} = time; } $Status{$host}{deadCnt}++; @@ -1014,17 +1017,24 @@ sub Main_Check_Client_Messages $host = $1; my $user = $2; my $backoff = $3; + $host = $bpc->uriUnesc($host); if ( $CmdJob ne $host && defined($Status{$host}) && defined($Jobs{$host}) ) { print(LOG $bpc->timeStamp, "Stopping current backup of $host," . " request by $user (backoff=$backoff)\n"); kill(2, $Jobs{$host}{pid}); - vec($FDread, $Jobs{$host}{fn}, 1) = 0; - close($Jobs{$host}{fh}); - delete($Jobs{$host}); + # + # Don't close the pipe now; wait until the child + # really exits later. Otherwise close() will + # block until the child has exited. + # old code: + ##vec($FDread, $Jobs{$host}{fn}, 1) = 0; + ##close($Jobs{$host}{fh}); + ##delete($Jobs{$host}); + $Status{$host}{state} = "Status_idle"; - $Status{$host}{reason} = "Reason_backup_canceled_by_user"; #FIXME: user should be $user (we need to substitute the variable in the l10n stuff) + $Status{$host}{reason} = "Reason_backup_canceled_by_user"; $Status{$host}{activeJob} = 0; $Status{$host}{startTime} = time; $reply = "ok: backup of $host cancelled"; @@ -1053,9 +1063,11 @@ sub Main_Check_Client_Messages QueueAllPCs(); } elsif ( $cmd =~ /^backup (\S+)\s+(\S+)\s+(\S+)\s+(\S+)/ ) { my $hostIP = $1; - $host = $2; - my $user = $3; + $host = $2; + my $user = $3; my $doFull = $4; + $host = $bpc->uriUnesc($host); + $hostIP = $bpc->uriUnesc($hostIP); if ( !defined($Status{$host}) ) { print(LOG $bpc->timeStamp, "User $user requested backup of unknown host" @@ -1084,6 +1096,7 @@ sub Main_Check_Client_Messages user => $user, reqTime => time, doFull => $doFull, + userReq => 1, dhcp => $hostIP eq $host ? 0 : 1, }); $UserQueueOn{$hostIP} = 1; @@ -1094,6 +1107,8 @@ sub Main_Check_Client_Messages $host = $2; my $user = $3; my $reqFileName = $4; + $host = $bpc->uriUnesc($host); + $hostIP = $bpc->uriUnesc($hostIP); if ( !defined($Status{$host}) ) { print(LOG $bpc->timeStamp, "User $user requested restore to unknown host" @@ -1110,6 +1125,7 @@ sub Main_Check_Client_Messages reqTime => time, dhcp => 0, restore => 1, + userReq => 1, }); $UserQueueOn{$host} = 1; if ( defined($Jobs{$host}) ) { @@ -1143,15 +1159,20 @@ sub Main_Check_Client_Messages } elsif ( $type =~ /^hosts/ ) { push(@values, \%Status); push(@names, qw(*Status)); - } elsif ( $type =~ /^host\((.*)\)/ - && defined($Status{$1}) ) { - push(@values, { - %{$Status{$1}}, - BgQueueOn => $BgQueueOn{$1}, - UserQueueOn => $UserQueueOn{$1}, - CmdQueueOn => $CmdQueueOn{$1}, - }); - push(@names, qw(*StatusHost)); + } elsif ( $type =~ /^host\((.*)\)/ ) { + my $h = $bpc->uriUnesc($1); + if ( defined($Status{$h}) ) { + push(@values, { + %{$Status{$h}}, + BgQueueOn => $BgQueueOn{$h}, + UserQueueOn => $UserQueueOn{$h}, + CmdQueueOn => $CmdQueueOn{$h}, + }); + push(@names, qw(*StatusHost)); + } else { + print(LOG $bpc->timeStamp, + "Unknown host $h for status request\n"); + } } else { print(LOG $bpc->timeStamp, "Unknown status request $type\n"); @@ -1162,6 +1183,7 @@ sub Main_Check_Client_Messages $reply = $dump->Dump; } elsif ( $cmd =~ /^link\s+(.+)/ ) { my($host) = $1; + $host = $bpc->uriUnesc($host); QueueLink($host); } elsif ( $cmd =~ /^log\s+(.*)/ ) { print(LOG $bpc->timeStamp, "$1\n"); @@ -1255,7 +1277,7 @@ sub StatusWrite [ \%Info, \%Status], [qw(*Info *Status)]); $dump->Indent(1); - if ( open(STATUS, ">$TopDir/log/status.pl") ) { + if ( open(STATUS, ">", "$TopDir/log/status.pl") ) { print(STATUS $dump->Dump); close(STATUS); } @@ -1335,7 +1357,7 @@ sub QueueLink host => $host, user => "BackupPC", reqTime => time, - cmd => "$BinDir/BackupPC_link $host" + cmd => ["$BinDir/BackupPC_link", $host], }); $CmdQueueOn{$host} = 1; }