fix for #693331, amserverconfig trying to create /var/lib/lib/amanda

[debian/amanda] / server-src / amrmtape.pl

diff --git a/server-src/amrmtape.pl b/server-src/amrmtape.pl
index 05a1fb635d5e0e43035d6590447e1f2e4843b4f3..f7d37081a4c60ade7f8adc7651a4d0534d86f09c 100644 (file)
--- a/server-src/amrmtape.pl
+++ b/server-src/amrmtape.pl
@@ -1,6 +1,6 @@
 #!@PERL@
 #
-# Copyright (c) 2008,2009 Zmanda, Inc.  All Rights Reserved.
+# Copyright (c) 2008-2012 Zmanda, Inc.  All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 as published
@@ -33,6 +33,7 @@ use Amanda::MainLoop;
 use Amanda::Tapelist;
 use Amanda::Util qw( :constants );
 use File::Copy;
+use File::Basename;
 use Getopt::Long;
 
 my $amadmin = "$sbindir/amadmin";
@@ -106,7 +107,10 @@ Amanda::Util::setup_application("amrmtape", "server", $CONTEXT_CMDLINE);
 
 my $config_overrides = new_config_overrides( scalar(@ARGV) + 1 );
 
+debug("Arguments: " . join(' ', @ARGV));
+Getopt::Long::Configure(qw{ bundling });
 my $opts_ok = GetOptions(
+    'version' => \&Amanda::Util::version_opt,
     "changer=s" => \$changer_name,
     "cleanup" => \$cleanup,
     "dryrun|n" => \$dry_run,
@@ -174,30 +178,34 @@ if ($cfgerr_level >= $CFGERR_ERRORS) {
     die "Errors processing disklist";
 }
 
-my $scrub_db = sub {
-    my $tapelist_file = config_dir_relative(getconf($CNF_TAPELIST));
-    my $tapelist = Amanda::Tapelist::read_tapelist($tapelist_file);
-    unless ($tapelist) {
-        die "Could not read the tapelist";
-    }
+my $tapelist_file = config_dir_relative(getconf($CNF_TAPELIST));
+my $tapelist = Amanda::Tapelist->new($tapelist_file, !$dry_run);
+unless ($tapelist) {
+    die "Could not read the tapelist";
+}
+
 
+my $scrub_db = sub {
+    my $t = $tapelist->lookup_tapelabel($label);
     if ($keep_label) {
-        my $t = $tapelist->lookup_tapelabel($label);
         $t->{'datestamp'} = 0 if $t;
+    } elsif (!defined $t) {
+       print "label '$label' not found in $tapelist_file\n";
+       exit 0;
     } else {
         $tapelist->remove_tapelabel($label);
     }
-    my $tmp_tapelist_file = "$AMANDA_TMPDIR/tapelist-amrmtape-" . time();
-    my $backup_tapelist_file = "$AMANDA_TMPDIR/tapelist-backup-amrmtape-" . time();
-    unless (copy($tapelist_file, $backup_tapelist_file)) {
-        die "Failed to copy/backup $tapelist_file to $backup_tapelist_file";
+
+    #take a copy in case we roolback
+    my $backup_tapelist_file = dirname($tapelist_file) . "-backup-amrmtape-" . time();
+    if (-x $tapelist_file) {
+       unless (copy($tapelist_file, $backup_tapelist_file)) {
+           die "Failed to copy/backup $tapelist_file to $backup_tapelist_file";
+       }
     }
-    # writing to temp and then moving is generally safer than writing directly
+
     unless ($dry_run) {
-        $tapelist->write($tmp_tapelist_file);
-        unless (move($tmp_tapelist_file, $tapelist_file)) {
-            die "Failed to replace old tapelist  with new tapelist.";
-        }
+        $tapelist->write();
     }
 
     my $tmp_curinfo_file = "$AMANDA_TMPDIR/curinfo-amrmtape-" . time();
@@ -234,7 +242,7 @@ my $scrub_db = sub {
             }
             my $level = $parts[1];
             my $cur_label = $parts[7];
-            if ($cur_label eq $label) {
+            if (defined $cur_label and $cur_label eq $label) {
                 $dead_level = $level;
                 vlog "Discarding Host: $host, Disk: $disk, Level: $level\n";
             } elsif ( $level > $dead_level ) {
@@ -291,7 +299,7 @@ my $erase_volume = make_cb('erase_volume' => sub {
         open(LOG, ">$log_file");
         print LOG "INFO amrmtape amrmtape pid $$\n";
         close LOG;
-       my $chg = Amanda::Changer->new($changer_name);
+       my $chg = Amanda::Changer->new($changer_name, tapelist => $tapelist);
        $chg->load(
            'label' => $label,
            'res_cb' => sub {
@@ -301,24 +309,36 @@ my $erase_volume = make_cb('erase_volume' => sub {
                 my $dev = $resv->{'device'};
                 die "Can not erase $label because the device doesn't support this feature"
                     unless $dev->property_get('full_deletion');
-                if (!$dry_run) {
-                    $dev->erase()
-                        or die "Failed to erase volume";
-                    $dev->finish();
 
-                    # label the tape with the same label it had
-                    if ($keep_label) {
-                        $dev->start($ACCESS_WRITE, $label, undef)
-                            or die "Failed to write tape label";
-                    }
-                }
+               my $rel_cb = make_cb('rel_cb' => sub {
+                   $resv->release(finished_cb => sub {
+                       my ($err) = @_;
 
-               $resv->release(finished_cb => sub {
-                   my ($err) = @_;
-                   die $err if $err;
+                       $chg->quit();
+                       die $err if $err;
 
-                   $scrub_db->();
+                       $scrub_db->();
+                   });
                });
+
+                if (!$dry_run) {
+                    $dev->erase()
+                        or die "Failed to erase volume";
+                   $resv->set_label(finished_cb => sub {
+                       $dev->finish();
+
+                       # label the tape with the same label it had
+                       if ($keep_label) {
+                           $dev->start($ACCESS_WRITE, $label, undef)
+                               or die "Failed to write tape label";
+                           return $resv->set_label(label => $label, finished_cb => $rel_cb);
+                       }
+                       $rel_cb->();
+                   });
+               } else {
+                   $rel_cb->();
+               }
+
             });
     } else {
         $scrub_db->();