X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=perl%2FAmanda%2FApplication%2FZfs.pm;h=551366f48a37e23ea724e730253cea8cb960adc2;hb=fd48f3e498442f0cbff5f3606c7c403d0566150e;hp=0cbd7a186eb1be6142e89ee99ae01a620b7a5bbe;hpb=96f35b20267e8b1a1c846d476f27fcd330e0b018;p=debian%2Famanda

diff --git a/perl/Amanda/Application/Zfs.pm b/perl/Amanda/Application/Zfs.pm
index 0cbd7a1..551366f 100644
--- a/perl/Amanda/Application/Zfs.pm
+++ b/perl/Amanda/Application/Zfs.pm
@@ -1,8 +1,8 @@
-# Copyright (c) 2005-2008 Zmanda Inc.  All Rights Reserved.
+# Copyright (c) 2008,2009 Zmanda, Inc.  All Rights Reserved.
 #
-# This library is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 2.1 as
-# published by the Free Software Foundation.
+# 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
+# by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -13,8 +13,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-# Contact information: Zmanda Inc, 465 S Mathlida Ave, Suite 300
-# Sunnyvale, CA 94086, USA, or: http://www.zmanda.com
+# Contact information: Zmanda Inc., 465 S. Mathilda Ave., Suite 300
+# Sunnyvale, CA 94085, USA, or: http://www.zmanda.com
 
 package Amanda::Application::Zfs;
 
@@ -37,21 +37,15 @@ Amanda::Application::Zfs -- collection of function to use with zfs
 sub zfs_set_value {
     my $self = shift;
 
-    my $action = $_[0];
-
     if (defined $self->{execute_where} && $self->{execute_where} ne "client") {
-	$self->print_to_server_and_die($action, " Script must be run on the client 'execute_where client'", $Amanda::Script_App::ERROR);
-    }
-    if (!defined $self->{device}) {
-	$self->print_to_server_and_die($action, "'--device' is not provided",
-                        $Amanda::Script_App::ERROR);
+	$self->print_to_server_and_die(" Script must be run on the client 'execute_where client'", $Amanda::Script_App::ERROR);
     }
     if ($self->{df_path} ne "df" && !-e $self->{df_path}) {
-	$self->print_to_server_and_die($action, "Can't execute DF-PATH '$self->{df_path}' command",
+	$self->print_to_server_and_die("Can't execute DF-PATH '$self->{df_path}' command",
                         $Amanda::Script_App::ERROR);
     }
     if ($self->{zfs_path} ne "zfs" && !-e $self->{zfs_path}) {
-        $self->print_to_server_and_die($action, "Can't execute ZFS-PATH '$self->{zfs_path}' command",
+        $self->print_to_server_and_die("Can't execute ZFS-PATH '$self->{zfs_path}' command",
                         $Amanda::Script_App::ERROR);
     }
 
@@ -59,15 +53,26 @@ sub zfs_set_value {
         $self->{pfexec_cmd} = $self->{pfexec_path};
     }
     if (defined $self->{pfexec_cmd} && $self->{pfexec_cmd} ne "pfexec" && !-e $self->{pfexec_cmd}) {
-        $self->print_to_server_and_die($action, "Can't execute PFEXEC-PATH '$self->{pfexec_cmd}' command",
+        $self->print_to_server_and_die("Can't execute PFEXEC-PATH '$self->{pfexec_cmd}' command",
                         $Amanda::Script_App::ERROR);
     }
     if (!defined $self->{pfexec_cmd}) {
         $self->{pfexec_cmd} = "";
     }
 
-    # determine if $self->{device} is a mountpoint or ZFS dataset
-    my $cmd = "$self->{pfexec_cmd} $self->{zfs_path} get -H -o value mountpoint $self->{device}";
+    if (!defined $self->{device}) {
+	if ($self->{action} eq "check") {
+	    return;
+	} else {
+	    $self->print_to_server_and_die("'--device' is not provided",
+					   $Amanda::Script_App::ERROR);
+	}
+    }
+
+    my $device = $self->{device};
+    $device = $self->{directory} if defined $self->{directory};
+    # determine if $device is a mountpoint or ZFS dataset
+    my $cmd = "$self->{pfexec_cmd} $self->{zfs_path} get -H -o value mountpoint $device";
     debug "running: $cmd";
     my($wtr, $rdr, $err, $pid);
     $err = Symbol::gensym;
@@ -82,7 +87,7 @@ sub zfs_set_value {
         chomp $zmountpoint;
 
         # zfs dataset supplied
-        $self->{filesystem} = $self->{device};
+        $self->{filesystem} = $device;
 
         # check if zfs volume
         if ($zmountpoint ne '-') {
@@ -92,8 +97,8 @@ sub zfs_set_value {
         }
     } else {
         # filesystem, directory or invalid ZFS dataset name
-        $cmd = "$self->{df_path} $self->{device}";
-        debug "running: $self->{df_path} $self->{device}";
+        $cmd = "$self->{df_path} $device";
+        debug "running: $self->{df_path} $device";
         $err = Symbol::gensym;
         $pid = open3($wtr, $rdr, $err, $cmd);
         close $wtr;
@@ -114,14 +119,14 @@ sub zfs_set_value {
                 chomp $errmsg;
             }
             if (defined $ret && defined $errmsg) {
-                $self->print_to_server_and_die($action, "$ret, $errmsg", $Amanda::Script_App::ERROR);
+                $self->print_to_server_and_die("$ret, $errmsg", $Amanda::Script_App::ERROR);
             } elsif (defined $ret) {
-                $self->print_to_server_and_die($action, $ret, $Amanda::Script_App::ERROR);
+                $self->print_to_server_and_die($ret, $Amanda::Script_App::ERROR);
             } elsif (defined $errmsg) {
-                $self->print_to_server_and_die($action, $errmsg, $Amanda::Script_App::ERROR);
+                $self->print_to_server_and_die($errmsg, $Amanda::Script_App::ERROR);
             } else {
-                $self->print_to_server_and_die($action,
-                            "Failed to find mount points: $self->{device}",
+                $self->print_to_server_and_die(
+                            "Failed to find mount points: $device",
                             $Amanda::Script_App::ERROR);
             }
         }
@@ -134,8 +139,8 @@ sub zfs_set_value {
                 $self->{mountpoint} = $1;
                 $self->{filesystem} = $4;
             } else {
-                $self->print_to_server_and_die($action,
-                            "Failed to find mount points: $self->{device}",
+                $self->print_to_server_and_die(
+                            "Failed to find mount points: $device",
                             $Amanda::Script_App::ERROR);
             }
         } else {
@@ -144,8 +149,8 @@ sub zfs_set_value {
                 $self->{mountpoint} = $6;
                 $self->{filesystem} = $1;
             } else {
-                $self->print_to_server_and_die($action,
-                            "Failed to find mount points: $self->{device}",
+                $self->print_to_server_and_die(
+                            "Failed to find mount points: $device",
                             $Amanda::Script_App::ERROR);
             }
         }
@@ -167,39 +172,39 @@ sub zfs_set_value {
                 chomp $errmsg;
             }
             if (defined $zmountpoint && defined $errmsg) {
-                $self->print_to_server_and_die($action, $zmountpoint, $errmsg, $Amanda::Script_App::ERROR);
+                $self->print_to_server_and_die($zmountpoint, $errmsg, $Amanda::Script_App::ERROR);
             } elsif (defined $zmountpoint) {
-                $self->print_to_server_and_die($action, $zmountpoint, $Amanda::Script_App::ERROR);
+                $self->print_to_server_and_die($zmountpoint, $Amanda::Script_App::ERROR);
             } elsif (defined $errmsg) {
-                $self->print_to_server_and_die($action, $errmsg, $Amanda::Script_App::ERROR);
+                $self->print_to_server_and_die($errmsg, $Amanda::Script_App::ERROR);
             } else {
-                $self->print_to_server_and_die($action,
+                $self->print_to_server_and_die(
                         "Failed to find mount points: $self->{filesystem}",
                         $Amanda::Script_App::ERROR);
             }
         }
         if ($zmountpoint ne 'legacy' && $zmountpoint ne $self->{mountpoint}) {
-            $self->print_to_server_and_die($action,
+            $self->print_to_server_and_die(
                 "mountpoint from 'df' ($self->{mountpoint}) and 'zfs list' ($zmountpoint) differ",
                 $Amanda::Script_App::ERROR);
         }
 
-        if (!($self->{device} =~ /^$self->{mountpoint}/)) {
-            $self->print_to_server_and_die($action,
-                "mountpoint '$self->{mountpoint}' is not a prefix of diskdevice '$self->{device}'",
+        if (!($device =~ /^$self->{mountpoint}/)) {
+            $self->print_to_server_and_die(
+                "mountpoint '$self->{mountpoint}' is not a prefix of the device '$device'",
                 $Amanda::Script_App::ERROR);
         }
 
     }
 
-    if ($action eq 'check') {
-      $self->{snapshot} = $self->zfs_build_snapshotname($self->{device}, -1);
+    if ($self->{action} eq 'check') {
+      $self->{snapshot} = $self->zfs_build_snapshotname($device, -1);
     } else {
-      $self->{snapshot} = $self->zfs_build_snapshotname($self->{device});
+      $self->{snapshot} = $self->zfs_build_snapshotname($device);
     }
     if (defined $self->{mountpoint}) {
-	if ($self->{device} =~ /^$self->{mountpoint}/) {
-            $self->{dir} = $self->{device};
+	if ($device =~ /^$self->{mountpoint}/) {
+            $self->{dir} = $device;
             $self->{dir} =~ s,^$self->{mountpoint},,;
             $self->{directory} = $self->{mountpoint} . "/.zfs/snapshot/" .
                                  $self->{snapshot} . $self->{dir};
@@ -212,7 +217,6 @@ sub zfs_set_value {
 
 sub zfs_create_snapshot {
     my $self = shift;
-    my $action = shift;
 
     my $cmd = "$self->{pfexec_cmd} $self->{zfs_path} snapshot $self->{filesystem}\@$self->{snapshot}";
     debug "running: $cmd";
@@ -227,20 +231,19 @@ sub zfs_create_snapshot {
     close $err;
     if( $? != 0 ) {
         if(defined $msg && defined $errmsg) {
-            $self->print_to_server_and_die($action, "$msg, $errmsg", $Amanda::Script_App::ERROR);
+            $self->print_to_server_and_die("$msg, $errmsg", $Amanda::Script_App::ERROR);
         } elsif (defined $msg) {
-            $self->print_to_server_and_die($action, $msg, $Amanda::Script_App::ERROR);
+            $self->print_to_server_and_die($msg, $Amanda::Script_App::ERROR);
         } elsif (defined $errmsg) {
-            $self->print_to_server_and_die($action, $errmsg, $Amanda::Script_App::ERROR);
+            $self->print_to_server_and_die($errmsg, $Amanda::Script_App::ERROR);
         } else {
-            $self->print_to_server_and_die($action, "cannot create snapshot '$self->{filesystem}\@$self->{snapshot}': unknown reason", $Amanda::Script_App::ERROR);
+            $self->print_to_server_and_die("cannot create snapshot '$self->{filesystem}\@$self->{snapshot}': unknown reason", $Amanda::Script_App::ERROR);
         }
     }
 }
 
 sub zfs_destroy_snapshot {
     my $self = shift;
-    my $action = shift;
 
     my $cmd = "$self->{pfexec_cmd} $self->{zfs_path} destroy $self->{filesystem}\@$self->{snapshot}";
     debug "running: $cmd|";
@@ -256,13 +259,13 @@ sub zfs_destroy_snapshot {
     close $err;
     if( $? != 0 ) {
         if(defined $msg && defined $errmsg) {
-            $self->print_to_server_and_die($action, "$msg, $errmsg", $Amanda::Script_App::ERROR);
+            $self->print_to_server_and_die("$msg, $errmsg", $Amanda::Script_App::ERROR);
         } elsif (defined $msg) {
-            $self->print_to_server_and_die($action, $msg, $Amanda::Script_App::ERROR);
+            $self->print_to_server_and_die($msg, $Amanda::Script_App::ERROR);
         } elsif (defined $errmsg) {
-            $self->print_to_server_and_die($action, $errmsg, $Amanda::Script_App::ERROR);
+            $self->print_to_server_and_die($errmsg, $Amanda::Script_App::ERROR);
         } else {
-            $self->print_to_server_and_die($action, "cannot destroy snapshot '$self->{filesystem}\@$self->{snapshot}': unknown reason", $Amanda::Script_App::ERROR);
+            $self->print_to_server_and_die("cannot destroy snapshot '$self->{filesystem}\@$self->{snapshot}': unknown reason", $Amanda::Script_App::ERROR);
         }
     }
 }
@@ -270,7 +273,6 @@ sub zfs_destroy_snapshot {
 sub zfs_destroy_snapshot_level {
     my $self = shift;
     my $level = shift;
-    my $action = shift;
 
     my $snapshotname = $self->zfs_find_snapshot_level($level);
     debug "zfs_destroy_snapshot_level: Current $snapshotname";
@@ -289,13 +291,13 @@ sub zfs_destroy_snapshot_level {
       close $err;
       if( $? != 0 ) {
           if(defined $msg && defined $errmsg) {
-              $self->print_to_server_and_die($action, "$msg, $errmsg", $Amanda::Script_App::ERROR);
+              $self->print_to_server_and_die("$msg, $errmsg", $Amanda::Script_App::ERROR);
           } elsif (defined $msg) {
-              $self->print_to_server_and_die($action, $msg, $Amanda::Script_App::ERROR);
+              $self->print_to_server_and_die($msg, $Amanda::Script_App::ERROR);
           } elsif (defined $errmsg) {
-              $self->print_to_server_and_die($action, $errmsg, $Amanda::Script_App::ERROR);
+              $self->print_to_server_and_die($errmsg, $Amanda::Script_App::ERROR);
           } else {
-              $self->print_to_server_and_die($action, "cannot destroy snapshot '$self->{filesystem}\@$self->{snapshot}': unknown reason", $Amanda::Script_App::ERROR);
+              $self->print_to_server_and_die("cannot destroy snapshot '$self->{filesystem}\@$self->{snapshot}': unknown reason", $Amanda::Script_App::ERROR);
           }
       }
     }
@@ -304,9 +306,10 @@ sub zfs_destroy_snapshot_level {
 sub zfs_rename_snapshot {
     my $self = shift;
     my $level = shift;
-    my $action = shift;
 
-    my $newsnapshotname = $self->zfs_build_snapshotname($self->{device}, $level);
+    my $device = $self->{device};
+    $device = $self->{directory} if defined $self->{directory};
+    my $newsnapshotname = $self->zfs_build_snapshotname($device, $level);
     my $cmd = "$self->{pfexec_cmd} $self->{zfs_path} rename $self->{filesystem}\@$self->{snapshot} $newsnapshotname";
     debug "running: $cmd|";
     my($wtr, $rdr, $err, $pid);
@@ -321,13 +324,13 @@ sub zfs_rename_snapshot {
     close $err;
     if( $? != 0 ) {
         if(defined $msg && defined $errmsg) {
-            $self->print_to_server_and_die($action, "$msg, $errmsg", $Amanda::Script_App::ERROR);
+            $self->print_to_server_and_die("$msg, $errmsg", $Amanda::Script_App::ERROR);
         } elsif (defined $msg) {
-            $self->print_to_server_and_die($action, $msg, $Amanda::Script_App::ERROR);
+            $self->print_to_server_and_die($msg, $Amanda::Script_App::ERROR);
         } elsif (defined $errmsg) {
-            $self->print_to_server_and_die($action, $errmsg, $Amanda::Script_App::ERROR);
+            $self->print_to_server_and_die($errmsg, $Amanda::Script_App::ERROR);
         } else {
-            $self->print_to_server_and_die($action, "cannot rename snapshot '$self->{filesystem}\@$self->{snapshot}': unknown reason", $Amanda::Script_App::ERROR);
+            $self->print_to_server_and_die("cannot rename snapshot '$self->{filesystem}\@$self->{snapshot}': unknown reason", $Amanda::Script_App::ERROR);
         }
     }
 }
@@ -336,21 +339,21 @@ sub zfs_purge_snapshot {
     my $self = shift;
     my $minlevel = shift;
     my $maxlevel = shift;
-    my $action = shift;
 
     my $level;
     for ($level = $maxlevel; $level >= $minlevel; $level--) {
 	debug "zfs_purge_snapshot: Check for existing snapshot at level $level";
-        $self->zfs_destroy_snapshot_level($level, $action);
+        $self->zfs_destroy_snapshot_level($level);
     }
 }
 
 sub zfs_find_snapshot_level {
     my $self = shift;
     my $level = shift;
-    my $action = shift;
 
-    my $snapshotname = $self->zfs_build_snapshotname($self->{device}, $level);
+    my $device = $self->{device};
+    $device = $self->{directory} if defined $self->{directory};
+    my $snapshotname = $self->zfs_build_snapshotname($device, $level);
 
     my $cmd =  "$self->{pfexec_cmd} $self->{zfs_path} list -t snapshot $self->{filesystem}\@$snapshotname";
     debug "running: $cmd|";
@@ -374,7 +377,6 @@ sub zfs_build_snapshotname {
     my $self = shift;
     my $device = shift;
     my $level = shift;
-    my $action = shift;
 
     my $snapshotname = "";