From ee05bc55bd6c6114eefeb8ced04d86ea054c3215 Mon Sep 17 00:00:00 2001 From: "R. Steve McKown" Date: Tue, 26 Nov 2013 09:58:10 -0700 Subject: [PATCH] BackupPC_ovz: implement a debug output file Debug is stored in the file /tmp/BackupPC_ovz.debug. For now, selecting debug on or off requires editing the script. A better solution would be to pass something in on the command line. --- BackupPC_ovz | 107 +++++++++++++++++++++++++++++---------------------- 1 file changed, 60 insertions(+), 47 deletions(-) diff --git a/BackupPC_ovz b/BackupPC_ovz index 06bf6a6..9e92313 100755 --- a/BackupPC_ovz +++ b/BackupPC_ovz @@ -24,6 +24,19 @@ my $snapsize = '25g'; my $hnlistFile = "/etc/backuppc/".basename($0).".hnlist"; my $velistFile = $ENV{HOME}."/log/".basename($0).".velist"; +# Uncomment one of the following +my $dbgf; +open $dbgf, ">>/tmp/BackupPC_ovz.debug" || die "Cannot open debug file"; +#open $dbgf, ">>/dev/null" || die "Cannot open debug file"; + +sub mydie($) +{ + my ($text) = @_; + + print $dbgf ": die $text\n"; + die $text; +} + sub cmdExecOrEval { my($cmd, @args) = @_; @@ -69,18 +82,18 @@ sub refreshConfig() # Write the VEs on all HNs to a config file on the BackupPC server for # later use. my @HNS = (); - open my $cfg, "<$hnlistFile" || die "Cannot read $hnlistFile"; + open my $cfg, "<$hnlistFile" || mydie "Cannot read $hnlistFile"; while (<$cfg>) { chomp; push(@HNS, split(' ')) if (! /^#/); } close($cfg); - die "No HNs defined in $hnlistFile" if ($#HNS < 0); + mydie "No HNs defined in $hnlistFile" if ($#HNS < 0); - open my $out, ">$velistFile" || die "Cannot write to $velistFile"; + open my $out, ">$velistFile" || mydie "Cannot write to $velistFile"; foreach my $hn (@HNS) { open my $fh, "ssh -l root $hn vzlist -a |" || - die "Can run remote vzlist command"; + mydie "Can run remote vzlist command"; while (<$fh>) { chomp; my ($veid, $junk, $running, $junk, $hostname) = split(' '); @@ -110,7 +123,7 @@ sub refreshConfig() sub loadVeList() { open my $fh, "<$velistFile" || - die "Cannot read from $velistFile. Set a preuser script."; + mydie "Cannot read from $velistFile. Set a preuser script."; while (<$fh>) { chomp; @@ -129,25 +142,25 @@ sub loadVeList() sub localVe($) { my ($veid) = @_; - die "HN: no veid" if (!defined($veid)); + mydie "HN: no veid" if (!defined($veid)); my $vzdir = '/etc/vz'; - die "HN is not running OpenVZ" if (!defined($vzdir)); + mydie "HN is not running OpenVZ" if (!defined($vzdir)); my $lockdir = undef; my $dumpdir = undef; my $private = undef; my $root = undef; - open my $fh, "<$vzdir/vz.conf" || die "Cannot open $vzdir/vz.conf"; + open my $fh, "<$vzdir/vz.conf" || mydie "Cannot open $vzdir/vz.conf"; while (<$fh>) { chomp; my ($name, $value) = split('='); if ($name eq 'LOCKDIR') { $lockdir = $value; - die "OpenVZ LOCKDIR ($lockdir) is invalid" if (! -d $lockdir); + mydie "OpenVZ LOCKDIR ($lockdir) is invalid" if (! -d $lockdir); } elsif ($name eq 'DUMPDIR') { $dumpdir = $value; - die "OpenVZ DUMPDIR ($dumpdir) is invalid" if (! -d $dumpdir); + mydie "OpenVZ DUMPDIR ($dumpdir) is invalid" if (! -d $dumpdir); } elsif ($name eq 'VE_PRIVATE') { $private = $value; } elsif ($name eq 'VE_ROOT') { @@ -157,11 +170,11 @@ sub localVe($) close($fh); my $confdir = "$vzdir/conf"; - die "OpenVZ conf dir ($confdir) not found" if (! -d $confdir); + mydie "OpenVZ conf dir ($confdir) not found" if (! -d $confdir); my $hostname = undef; my $conffile = "$confdir/$veid.conf"; - open $fh, "<$conffile" || die "Cannot open $conffile"; + open $fh, "<$conffile" || mydie "Cannot open $conffile"; while (<$fh>) { chomp; my ($name, $value) = split('='); @@ -176,15 +189,15 @@ sub localVe($) $private =~ s/"//g; $private =~ s|/\$VEID|/$veid|g; - die "VE_PRIVATE is not defined" if (!defined($private)); - die "VE $veid private dir ($private) not found" if (! -d $private); + mydie "VE_PRIVATE is not defined" if (!defined($private)); + mydie "VE $veid private dir ($private) not found" if (! -d $private); $root =~ s|/\$VEID|/$veid|g; $root =~ s/"//g; - die "VE_ROOT is not defined" if (!defined($root)); - die "VE $veid root dir ($root) not found" if (! -d $root); + mydie "VE_ROOT is not defined" if (!defined($root)); + mydie "VE $veid root dir ($root) not found" if (! -d $root); - die "VE $veid has no HOSTNAME" if (!defined($hostname)); + mydie "VE $veid has no HOSTNAME" if (!defined($hostname)); my $status = `vzctl status $veid`; my $running = 0; @@ -219,10 +232,10 @@ sub getVeByHostname($) my ($host) = @_; my $hostname = gethostbyaddr(gethostbyname($host), AF_INET); - die "Host $host not found" if (!defined($hostname)); + mydie "Host $host not found" if (!defined($hostname)); my $ve = getVeEntry('hostname', $hostname); - die "Host $hostname is not a VE" if (!defined($ve)); + mydie "Host $hostname is not a VE" if (!defined($ve)); return $ve; } @@ -242,7 +255,7 @@ sub printVeEntry($) { my ($ve) = @_; - die "No VE to print" if (!defined($ve)); + mydie "No VE to print" if (!defined($ve)); print STDERR '{ '; #foreach my $k (keys %{$velist[0]}) { foreach my $k (keys %{$ve}) { @@ -254,7 +267,7 @@ sub printVeEntry($) sub delSnapshot($) { my ($ve) = @_; - die "No VE record for delSnapshot" if (!defined($ve)); + mydie "No VE record for delSnapshot" if (!defined($ve)); #print "delSnapshot: doing nothing for now\n"; #printVeEntry($ve); @@ -275,7 +288,7 @@ sub getDevice($) { my ($dir) = @_; - open my $fh, "df -P '$dir'|" || die "Unable to exec df"; + open my $fh, "df -P '$dir'|" || mydie "Unable to exec df"; <$fh>; # skip header my $df = <$fh>; close($fh); @@ -284,7 +297,7 @@ sub getDevice($) my $vg = undef; my $lv = undef; - open $fh, "lvscan|" || die "Unable to exec lvscan"; + open $fh, "lvscan|" || mydie "Unable to exec lvscan"; while (my $line = <$fh>) { if ($line =~ m|^\s+ACTIVE\s+\'/dev/([^/]+)/([^\']+)\'\s|) { # vg is $1, lv is $2 @@ -296,28 +309,28 @@ sub getDevice($) } close($fh); - die "Device $dev has no LVM entry for volume group" if (!defined($vg)); - die "Device $dev has no LVM entry for logical volume" if (!defined($lv)); + mydie "Device $dev has no LVM entry for volume group" if (!defined($vg)); + mydie "Device $dev has no LVM entry for logical volume" if (!defined($lv)); return ($dev, $mpoint, $vg, $lv); } sub makeSnapshot($) { my ($ve) = @_; - die "No VE record for snapshot" if (!defined($ve)); + mydie "No VE record for snapshot" if (!defined($ve)); my ($dev, $lvmpath, $vg, $lv) = getDevice($ve->{'private'}); #print "snapshot: dev=$dev, lvmpath=$lvmpath, vg=$vg, lm=$lv\n"; - die "Can't find device for VE filesystem" if (!defined($dev)); + mydie "Can't find device for VE filesystem" if (!defined($dev)); my $snaproot = "/$vzsnap"; mkpath "$snaproot" || - die "Can't create snapshot directory (backup in progress?)"; + mydie "Can't create snapshot directory (backup in progress?)"; $ve->{'snaproot'} = $snaproot; my $snapdev = "/dev/$vg/$vzsnap"; - die "Snapshot dev $snapdev exists (backup in progress?)" if (-b $snapdev); + mydie "Snapshot dev $snapdev exists (backup in progress?)" if (-b $snapdev); # FIXME: xfs_freeze hangs; without it we are likely to fail at some point. # FIXME: finding the mount point instead of hard coding. #cmdSystemOrEval("xfs_freeze -f /var/lib/vz/private"); @@ -325,7 +338,7 @@ sub makeSnapshot($) #cmdSystemOrEval("xfs_freeze -u /var/lib/vz/private"); if (! -b $snapdev) { delSnapshot($ve); - die "Failed to create snapshot device" + mydie "Failed to create snapshot device" } $ve->{'snapdev'} = $snapdev; cmdSystemOrEval("mount -o noatime,nodiratime $snapdev $snaproot"); @@ -335,20 +348,20 @@ sub makeSnapshot($) #print "snapshot: snapprivate = $snapprivate\n"; if ($snapprivate !~ /$vzsnap/ || ! -d $snapprivate) { delSnapshot($ve); - die "Wrong lvm mount point $lvmpath"; + mydie "Wrong lvm mount point $lvmpath"; } $ve->{'snapprivate'} = $snapprivate; if (! -d "/$snapprivate/etc") { delSnapshot($ve); - die "Mount failure or filesystem doesn't belong to a VE"; + mydie "Mount failure or filesystem doesn't belong to a VE"; } } sub saveConfigs($) { my ($ve) = @_; - die "No VE record for saveConfigs" if (!defined($ve)); + mydie "No VE record for saveConfigs" if (!defined($ve)); # Copy configuration and other scripts belonging to VE into VE's snapshot. # Do this in a manner similar to that supported by vzdump for consistency. @@ -367,16 +380,16 @@ sub saveConfigs($) sub restoreConfigs($) { my ($ve) = @_; - die "No VE record for restoreConfigs" if (!defined($ve)); + mydie "No VE record for restoreConfigs" if (!defined($ve)); my $private = $ve->{'private'}; - die "Can't restore invalid private dir $private" if (! -d $private); + mydie "Can't restore invalid private dir $private" if (! -d $private); my $qprivate = $private; $qprivate =~ s|/|\\\/|g; $qprivate =~ s|/$ve->{'VEID'}$|/\$VEID|; my $root = $ve->{'root'}; - die "Can't restore invalid root dir $root" if (! -d $root); + mydie "Can't restore invalid root dir $root" if (! -d $root); my $qroot = $root; $qroot =~ s|/|\\\/|g; $qroot =~ s|/$ve->{'VEID'}$|/\$VEID|; @@ -400,13 +413,13 @@ sub restoreConfigs($) sub checkRunningClient() { - die "A backup or restore operation are already in progress" + 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! my $vg = undef; - open my $fh, "lvscan|" || die "Unable to exec lvscan"; + open my $fh, "lvscan|" || mydie "Unable to exec lvscan"; while (my $line = <$fh>) { if ($line =~ m|^\s+ACTIVE\s+Snapshot\s+\'/dev/([^/]+)/$vzsnap\'\s|) { $vg = $1; @@ -429,19 +442,19 @@ sub runClient($) checkRunningClient(); my $veid = shift(@ARGV); - die "HN needs a VEID argument" if (!defined($veid)); - die "HN: no command to execute after VEID" if ($#ARGV < 0); + mydie "HN needs a VEID argument" if (!defined($veid)); + mydie "HN: no command to execute after VEID" if ($#ARGV < 0); # We (the HN where this code is running) must be hosting the requested VE. my $ve = localVe($veid); - die "VE $veid not found on this HN" if (!defined($ve)); + mydie "VE $veid not found on this HN" if (!defined($ve)); #printVeEntry($ve); if (!$restore) { cmdSystemOrEval("vzctl stop $veid >/dev/null 2>&1") if ($ve->{'running'}); makeSnapshot($ve); cmdSystemOrEval("vzctl start $veid >/dev/null 2>&1") if ($ve->{'running'}); - die "Failed to make snapshot of filesystem for VE $veid" + mydie "Failed to make snapshot of filesystem for VE $veid" if (!defined($ve->{'snaproot'})); # Save the VE configuration from its hosted HN into the filesystem. If @@ -480,13 +493,13 @@ sub runServer($) my ($restore) = @_; my $host = shift(@ARGV); - die "Hostname argument required" if (!defined($host)); - die "No command to execute after hostname" if ($#ARGV < 0); + mydie "Hostname argument required" if (!defined($host)); + mydie "No command to execute after hostname" if ($#ARGV < 0); # Find $host in the list of VEs loadVeList(); my $ve = getVeByHostname($host); - die "$host is not a VE or list of HNs in $0 is wrong" if (!defined($ve)); + mydie "$host is not a VE or list of HNs in $0 is wrong" if (!defined($ve)); #printVeEntry($ve); # The client command is bisected by the next occurrence of $host. Everything @@ -506,8 +519,8 @@ sub runServer($) } } } - die "No ssh command found" if ($#sshCmd < 0); - die "No xfer command found" if ($#xferCmd < 0); + mydie "No ssh command found" if ($#sshCmd < 0); + mydie "No xfer command found" if ($#xferCmd < 0); #print "ssh command: |".join(' ', @sshCmd)."|\n"; #print "xfer command: |".join(' ', @xferCmd)."|\n"; -- 2.39.2