X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=bin%2FBackupPC;h=f3df54a00c99cb471aa7132ad880537641765c4a;hp=2053aa5bf1894512ee5edf1ddca3eeb822034246;hb=f076585d3ff9dfe6de32292b897e293008efe74e;hpb=16755c17628b28a58d75663d7541036344826961 diff --git a/bin/BackupPC b/bin/BackupPC index 2053aa5..f3df54a 100755 --- a/bin/BackupPC +++ b/bin/BackupPC @@ -29,7 +29,7 @@ # Craig Barratt # # COPYRIGHT -# Copyright (C) 2001-2003 Craig Barratt +# Copyright (C) 2001-2007 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 @@ -47,7 +47,7 @@ # #======================================================================== # -# Version 3.0.0, released 28 Jan 2007. +# Version 3.2.0, released 31 Dec 2008. # # See http://backuppc.sourceforge.net. # @@ -59,7 +59,7 @@ use vars qw(%Status %Info $Hosts); use lib "/usr/local/BackupPC/lib"; use BackupPC::Lib; use BackupPC::FileZIO; -use Encode; +use Encode qw/decode_utf8/; use File::Path; use Data::Dumper; @@ -248,14 +248,16 @@ sub Main_Initialize umask($Conf{UmaskMode}); # - # Check for another running process, check that PASSWD is set and - # verify executables are configured correctly. + # Check for another running process, verify executables are configured + # correctly and make sure $TopDir is on a file system that supports + # hardlinks. # if ( $Info{pid} ne "" && kill(0, $Info{pid}) ) { print(STDERR $bpc->timeStamp, "Another BackupPC is running (pid $Info{pid}); quitting...\n"); exit(1); } + foreach my $progName ( qw(SmbClientPath NmbLookupPath PingPath DfPath SendmailPath SshPath) ) { next if ( $Conf{$progName} eq "" || -x $Conf{$progName} ); @@ -265,6 +267,17 @@ sub Main_Initialize exit(1); } + if ( !$bpc->HardlinkTest("$TopDir/pc", "$TopDir/cpool") ) { + print(STDERR $bpc->timeStamp, "Can't create a test hardlink between a file" + . " in $TopDir/pc and $TopDir/cpool. Either these are different" + . " file systems, or this file system doesn't support hardlinks," + . " or these directories don't exist, or there is a permissions" + . " problem, or the file system is out of inodes or full. Use" + . " df, df -i, and ls -ld to check each of these possibilities." + . " Quitting...\n"); + exit(1); + } + if ( $opts{d} ) { # # daemonize by forking; more robust method per: @@ -522,6 +535,8 @@ sub Main_TryToRun_CmdQueue } if ( !$pid ) { setpgrp 0,0; + $ENV{BPC_REQUSER} = $req->{user}; + POSIX::nice($Conf{CmdQueueNice}) if ( $Conf{CmdQueueNice} ); exec(@$cmd); print(LOG $bpc->timeStamp, "can't exec @$cmd for $host\n"); exit(0); @@ -1327,6 +1342,24 @@ sub Main_Check_Client_Messages QueueAllPCs(); } elsif ( $cmd =~ /^BackupPC_nightly run$/ ) { $RunNightlyWhenIdle = 1; + } elsif ( $cmd =~ /^queue (\S+)$/ ) { + $host = $1; + $host = $bpc->uriUnesc($host); + if ( !defined($Hosts->{$host}) ) { + print(LOG $bpc->timeStamp, + "User requested backup of unknown host $host\n"); + $reply = "error: unknown host $host"; + } else { + if ( QueueOnePC($host) ) { + print(LOG $bpc->timeStamp, + "Disk too full ($Info{DUlastValue}%); skipped 1 host\n"); + $Info{DUDailySkipHostCnt}++; + $reply = "error: disk too full to queue $host"; + } else { + print(LOG $bpc->timeStamp, "Host $host queued by user.\n"); + $reply = "ok: $host queued"; + } + } } elsif ( $cmd =~ /^backup (\S+)\s+(\S+)\s+(\S+)\s+(\S+)/ ) { my $hostIP = $1; $host = $2; @@ -1334,7 +1367,7 @@ sub Main_Check_Client_Messages my $doFull = $4; $host = $bpc->uriUnesc($host); $hostIP = $bpc->uriUnesc($hostIP); - if ( !defined($Status{$host}) ) { + if ( !defined($Hosts->{$host}) ) { print(LOG $bpc->timeStamp, "User $user requested backup of unknown host" . " $host\n"); @@ -1399,7 +1432,7 @@ sub Main_Check_Client_Messages my $reqFileName = $4; $host = $bpc->uriUnesc($host); $hostIP = $bpc->uriUnesc($hostIP); - if ( !defined($Status{$host}) ) { + if ( !defined($Hosts->{$host}) ) { print(LOG $bpc->timeStamp, "User $user requested restore to unknown host" . " $host"); @@ -1576,10 +1609,8 @@ sub StatusWrite [ \%Info, \%Status], [qw(*Info *Status)]); $dump->Indent(1); - if ( open(STATUS, ">", "$LogDir/status.pl") ) { - print(STATUS $dump->Dump); - close(STATUS); - } + my $text = $dump->Dump; + $bpc->{storage}->TextFileWrite("$LogDir/status.pl", $text); } # @@ -1597,7 +1628,6 @@ sub HostSortCompare # # Hosts with no errors go after hosts with errors # - return 1 if ( $Status{$a}{error} eq "" && $Status{$b}{error} ne "" ); # @@ -1612,6 +1642,65 @@ sub HostSortCompare return $a cmp $b; } +sub QueueOnePC +{ + my($host) = @_; + my $skipped = 0; + + delete($Status{$host}{backoffTime}) + if ( defined($Status{$host}{backoffTime}) + && $Status{$host}{backoffTime} < time ); + return if ( defined($Jobs{$host}) + || $BgQueueOn{$host} + || $UserQueueOn{$host} + || $CmdQueueOn{$host} ); + if ( $Hosts->{$host}{dhcp} ) { + $Status{$host}{dhcpCheckCnt}++; + if ( $RunNightlyWhenIdle ) { + # + # Once per night queue a check for DHCP hosts that just + # checks for expired dumps. We need to do this to handle + # the case when a DHCP host has not been on the network for + # a long time, and some of the old dumps need to be expired. + # Normally expiry checks are done by BackupPC_dump only + # after the DHCP hosts has been detected on the network. + # + unshift(@BgQueue, + {host => $host, user => "BackupPC", reqTime => time, + dhcp => 0, dumpExpire => 1}); + $BgQueueOn{$host} = 1; + } + } else { + # + # this is a fixed ip host: queue it + # + if ( $Info{DUlastValue} > $Conf{DfMaxUsagePct} ) { + # + # Since we are out of disk space, instead of queuing + # a regular job, queue an expire check instead. That + # way if the admin reduces the number of backups to + # keep then we will actually delete them. Otherwise + # BackupPC_dump will never run since we have exceeded + # the limit. + # + $skipped = 1; + unshift(@BgQueue, + {host => $host, user => "BackupPC", reqTime => time, + dhcp => $Hosts->{$host}{dhcp}, dumpExpire => 1}); + } else { + # + # Queue regular background backup + # + unshift(@BgQueue, + {host => $host, user => "BackupPC", reqTime => time, + dhcp => $Hosts->{$host}{dhcp}}); + } + $BgQueueOn{$host} = 1; + } + + return $skipped; +} + # # Queue all the hosts for backup. This means queuing all the fixed # ip hosts and all the dhcp address ranges. We also additionally @@ -1620,57 +1709,9 @@ sub HostSortCompare sub QueueAllPCs { my $nSkip = 0; + foreach my $host ( sort(HostSortCompare keys(%$Hosts)) ) { - delete($Status{$host}{backoffTime}) - if ( defined($Status{$host}{backoffTime}) - && $Status{$host}{backoffTime} < time ); - next if ( defined($Jobs{$host}) - || $BgQueueOn{$host} - || $UserQueueOn{$host} - || $CmdQueueOn{$host} ); - if ( $Hosts->{$host}{dhcp} ) { - $Status{$host}{dhcpCheckCnt}++; - if ( $RunNightlyWhenIdle ) { - # - # Once per night queue a check for DHCP hosts that just - # checks for expired dumps. We need to do this to handle - # the case when a DHCP host has not been on the network for - # a long time, and some of the old dumps need to be expired. - # Normally expiry checks are done by BackupPC_dump only - # after the DHCP hosts has been detected on the network. - # - unshift(@BgQueue, - {host => $host, user => "BackupPC", reqTime => time, - dhcp => 0, dumpExpire => 1}); - $BgQueueOn{$host} = 1; - } - } else { - # - # this is a fixed ip host: queue it - # - if ( $Info{DUlastValue} > $Conf{DfMaxUsagePct} ) { - # - # Since we are out of disk space, instead of queuing - # a regular job, queue an expire check instead. That - # way if the admin reduces the number of backups to - # keep then we will actually delete them. Otherwise - # BackupPC_dump will never run since we have exceeded - # the limit. - # - $nSkip++; - unshift(@BgQueue, - {host => $host, user => "BackupPC", reqTime => time, - dhcp => $Hosts->{$host}{dhcp}, dumpExpire => 1}); - } else { - # - # Queue regular background backup - # - unshift(@BgQueue, - {host => $host, user => "BackupPC", reqTime => time, - dhcp => $Hosts->{$host}{dhcp}}); - } - $BgQueueOn{$host} = 1; - } + $nSkip += QueueOnePC($host); } if ( $nSkip ) { print(LOG $bpc->timeStamp,