X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=BackupPC_ovz;h=38e888ac0016e6e96afbde72c0bc3ffa9e6562a8;hb=5c0ee53e9863658a25aedba532bf1a5a76b8b0de;hp=9e92313a6065baa48e27511f9e09ac7054f1b4a6;hpb=ee05bc55bd6c6114eefeb8ced04d86ea054c3215;p=ovzbpc.git

diff --git a/BackupPC_ovz b/BackupPC_ovz
index 9e92313..38e888a 100755
--- a/BackupPC_ovz
+++ b/BackupPC_ovz
@@ -24,10 +24,13 @@ my $snapsize = '25g';
 my $hnlistFile = "/etc/backuppc/".basename($0).".hnlist";
 my $velistFile = $ENV{HOME}."/log/".basename($0).".velist";
 
-# Uncomment one of the following
+# Write to the debug file only if it is already present
+my $dbgfn = "/tmp/BackupPC_ovz.debug";
 my $dbgf;
-open $dbgf, ">>/tmp/BackupPC_ovz.debug" || die "Cannot open debug file";
-#open $dbgf, ">>/dev/null" || die "Cannot open debug file";
+if ( ! -f $dbgfn) {
+  $dbgfn = "/dev/null";
+}
+open $dbgf, ">>$dbgfn" || die "Cannot open debug file $dbgfn";
 
 sub mydie($)
 {
@@ -47,7 +50,8 @@ sub cmdExecOrEval
     print(STDERR "Perl code fragment for exec shouldn't return!!\n");
     exit(1);
   } else {
-  $cmd = [split(/\s+/, $cmd)] if ( ref($cmd) ne "ARRAY" );
+    $cmd = [split(/\s+/, $cmd)] if ( ref($cmd) ne "ARRAY" );
+    print $dbgf ": execing command $cmd\n";
     alarm(0);
     $cmd = [map { m/(.*)/ } @$cmd];	# untaint
     #
@@ -68,8 +72,10 @@ sub cmdSystemOrEval
   $? = 0;
   $cmd = join(" ", $cmd) if ( ref($cmd) eq "ARRAY" );
   if ( (ref($cmd) eq "ARRAY" ? $cmd->[0] : $cmd) =~ /^\&/ ) {
+    print $dbgf ": evaluating command $cmd\n";
     eval($cmd);
   } else {
+    print $dbgf ": running command $cmd\n";
     system($cmd);
   }
 }
@@ -82,6 +88,8 @@ sub refreshConfig()
   # Write the VEs on all HNs to a config file on the BackupPC server for
   # later use.
   my @HNS = ();
+
+  print $dbgf ": refreshConfig\n";
   open my $cfg, "<$hnlistFile" || mydie "Cannot read $hnlistFile";
   while (<$cfg>) {
     chomp;
@@ -267,6 +275,7 @@ sub printVeEntry($)
 sub delSnapshot($)
 {
   my ($ve) = @_;
+  print $dbgf ": delSnapshot\n";
   mydie "No VE record for delSnapshot" if (!defined($ve));
 
   #print "delSnapshot: doing nothing for now\n";
@@ -276,12 +285,19 @@ sub delSnapshot($)
   my $dir = $ve->{'snaproot'};
   if (defined($dir) && -d $dir) {
     #cmdSystemOrEval("rm -rf $dir/etc/vzdump");
+    print $dbgf ": delSnapshot snapshot mounted at $dir\n";
     cmdSystemOrEval("umount $dir");
     cmdSystemOrEval("rmdir $dir");
   }
 
   my $dev = $ve->{'snapdev'};
-  cmdSystemOrEval("lvremove -f $dev >/dev/null 2>&1") if (-b $dev);
+  #cmdSystemOrEval("lvremove -f $dev >/dev/null 2>&1") if (-b $dev);
+  if (-b $dev) {
+    print $dbgf ": removing LV $dev\n";
+    system("lvremove -f $dev >>$dbgfn 2>&1")
+  } else {
+    print $dbgf ": lvremove: $dev is not block special\n";
+  }
 }
 
 sub getDevice($)
@@ -413,32 +429,65 @@ sub restoreConfigs($)
 
 sub checkRunningClient()
 {
+  print $dbgf ": checkRunningClient, vzsnap=$vzsnap\n";
   mydie "A backup or restore operation are already in progress"
     if (Proc::PID::File->running({ dir => '/tmp', verify => 1 }));
 
   # Clean up any prior backup's mount point and snapshot, if it exists.
   # Note that the snapshot is small, so we don't really want it lying around!
+  # There are cases where the snapshot will not show as a snapshot, and in
+  # these cases the LV will not be removed by this function.
   my $vg = undef;
   open my $fh, "lvscan|" || mydie "Unable to exec lvscan";
   while (my $line = <$fh>) {
+    #print $dbgf ": checkRunningClient lvscan line=$line\n";
     if ($line =~ m|^\s+ACTIVE\s+Snapshot\s+\'/dev/([^/]+)/$vzsnap\'\s|) {
       $vg = $1;
+      #print $dbgf ": checkRunningClient vg=$vg\n";
     }
   }
   close($fh);
   if (defined($vg)) {
     my $dev = "/dev/mapper/$vg-$vzsnap";
-    #print "Found vzsnap lv $dev\n";
+    print $dbgf ": found vzsnap lv $dev\n";
     cmdSystemOrEval("umount /$vzsnap");
     cmdSystemOrEval("rmdir /$vzsnap") if (-d "/$vzsnap");
-    cmdSystemOrEval("lvremove -f $dev >/dev/null 2>&1") if (-b $dev);
+    #cmdSystemOrEval("lvremove -f $dev >/dev/null 2>&1") if (-b $dev);
+    system("lvremove -f $dev >>$dbgfn 2>&1") if (-b $dev);
+  }
+}
+
+sub runPing()
+{
+  # This command generates ping output by pinging the host specified in the
+  # ping command still within @ARGV.  However, if the host listed therein is
+  # a VE, the HN must be pinged instead.
+
+  # Get the host
+  my $host = shift(@ARGV);
+  my $cmd = join(' ', @ARGV);
+
+  print $dbgf ": runPing host=$host, cmd=$cmd\n";
+  # Find $host in the list of VEs
+  loadVeList();
+  my $hostname = gethostbyaddr(gethostbyname($host), AF_INET);
+  mydie "Host $host not found" if (!defined($hostname));
+  my $ve = getVeEntry('hostname', $hostname);
+  if (defined($ve)) {
+    $hostname = $ve->{'HN'};
+    mydie "HN is undefined for host $host" if (!defined($hostname));
+    $cmd =~ s/$host/$hostname/g;
+    print $dbgf ": ping request for $host remapped to HN $hostname\n";
   }
+
+  cmdExecOrEval($cmd);
 }
 
 sub runClient($)
 {
   my ($restore) = @_;
 
+  print $dbgf ": runClient restore=$restore\n";
   checkRunningClient();
 
   my $veid = shift(@ARGV);
@@ -474,6 +523,8 @@ sub runClient($)
     # Remove snapshot, we're done
     delSnapshot($ve);
 
+    print $dbgf ": runClient complete\n";
+
     # Pass the return code back
     #exit $ret; FIXME: currently, cmdSystemOrEval doesn't return a retcode.
     exit 0;
@@ -491,8 +542,9 @@ sub runClient($)
 sub runServer($)
 {
   my ($restore) = @_;
-
   my $host = shift(@ARGV);
+
+  print $dbgf ": runServer restore=$restore, host=$host\n";
   mydie "Hostname argument required" if (!defined($host));
   mydie "No command to execute after hostname" if ($#ARGV < 0);
 
@@ -557,10 +609,21 @@ if ($ARGV[0] eq "restore") {
   #print "Restore mode\n";
 }
 
+my $ping  = 0;
+if ($ARGV[0] eq "ping") {
+  shift(@ARGV);
+  $ping = 1;
+  #print "Ping mode\n";
+}
+
+print $dbgf ": server=$server, refresh=$refresh, restore=$restore ping=$ping";
+print $dbgf " on ".`date`;
 if ($server) {
   runServer($restore);
 } elsif ($refresh) {
   refreshConfig();
+} elsif ($ping) {
+  runPing();
 } else {
   runClient($restore);
 }