Merge pull request #51 from hadfl/forkcall_error_event

ready for 0.8

AUTHORS

@@ -1,2 +1,2 @@
-Dominik Hassler <hadfl[email protected]>
+Dominik Hassler <hadfl@cpan.org>
 Tobias Oetiker <[email protected]>

bin/znapzend

@@ -84,7 +84,7 @@ this program. If not, see L<http://www.gnu.org/licenses/>.
 =head1 AUTHOR
 
 S<Tobias Oetiker E<lt>[email protected]E<gt>>
-S<Dominik Hassler> E<lt>hadfl[email protected]E<gt>>
+S<Dominik Hassler E<lt>hadfl@cpan.orgE<gt>>
 
 =head1 HISTORY
 

bin/znapzendzetup

@@ -258,7 +258,7 @@ where 'command' is one of the following:
 
     delete [--dst=key] <src_dataset>
 
-    edit [--recursive=on|off] [--mbuffer=<path>|off] [--mbuffersize=<size>] \
+    edit   [--recursive=on|off] [--mbuffer=<path>|off] [--mbuffersize=<size>] \
            [--pre-snap-command=<command>|off] \
            [--post-snap-command=<command>|off] \
            [--tsformat=<format>] --donotask \
@@ -374,7 +374,7 @@ this program. If not, see L<http://www.gnu.org/licenses/>.
 =head1 AUTHOR
 
 S<Tobias Oetiker E<lt>[email protected]E<gt>>
-S<Dominik Hassler> E<lt>hadfl[email protected]E<gt>>
+S<Dominik Hassler E<lt>hadfl@cpan.orgE<gt>>
 
 =head1 HISTORY
 

bin/znapzendztatz

@@ -19,8 +19,8 @@ my $zTime   = ZnapZend::Time->new();
 sub dumpStats {
     my $stats = shift;
 
-    print ' ' x (5- length($stats->{count})) . $stats->{count};
-    print ' ' x (14 - length($stats->{usage})) . $stats->{usage};
+    print ' ' x (7 - length($stats->{count})) . $stats->{count};
+    print ' ' x (8 - length($stats->{usage})) . $stats->{usage};
     print "   $stats->{dataset}\n";
 }
 
@@ -42,7 +42,7 @@ sub collectData {
 sub main {
     my $opts = {};
 
-    GetOptions($opts, qw(help man)) or exit 1;
+    GetOptions($opts, qw(H help|h man)) or exit 1;
 
     $opts->{help} && do {
         pod2usage(-exitval => 'NOEXIT');
@@ -61,7 +61,7 @@ sub main {
     @$backupSets or die "ERROR: no valid znapzend setup found on source\n";
 
     #print header
-    print "snapshot\ncount   space usage   dataset\n";
+    print "COUNT      USED   DATASET\n" if !$opts->{H};
 
     for my $backupSet (@$backupSets){
         my $datasets = $backupSet->{recursive} eq 'on'
@@ -106,10 +106,11 @@ znapzendztatz - znapzend statistics utility
 
 =head1 SYNOPSIS
 
-B<znapzendztatz> [src_dataset]
+B<znapzendztatz> [I<options>...] [src_dataset]
 
-    --help
-    --man
+ -H         do not print headers
+ --man      show man-page and exit
+ -h,--help  display this help and exi
 
 =head1 DESCRIPTION
 
@@ -137,7 +138,7 @@ this program. If not, see L<http://www.gnu.org/licenses/>.
 =head1 AUTHOR
 
 S<Tobias Oetiker E<lt>[email protected]E<gt>>
-S<Dominik Hassler> E<lt>hadfl[email protected]E<gt>>
+S<Dominik Hassler E<lt>hadfl@cpan.orgE<gt>>
 
 =head1 HISTORY
 

lib/ZnapZend.pm

@@ -29,6 +29,7 @@ has daemonize   => sub { 0 };
 has loglevel    => sub { q{debug} };
 has logto       => sub { q{} };
 has pidfile     => sub { q{} };
+has terminate   => sub { 0 };
 
 has backupSets       => sub { [] };
 
@@ -66,7 +67,8 @@ has zLog => sub {
         $log->on(
             message => sub {
                 my ($log, $level, @lines) = @_;
-                print STDERR $logLevels{$level} . ': ' . join(' ', @lines) . "\n";
+                print STDERR '[' . localtime . '] ['
+                    . $level . '] ' . join(' ', @lines) . "\n";
             }
         );
 
@@ -93,6 +95,9 @@ has zLog => sub {
 my $killThemAll  = sub {
     my $self = shift;
 
+    #set termination flag
+    $self->terminate(1);
+
     Mojo::IOLoop->reset;
 
     for my $backupSet (@{$self->backupSets}){
@@ -220,25 +225,49 @@ my $sendWorker = sub {
 
 ### RM_COMM_4_TEST ###  # remove ### RM_COMM_4_TEST ### comments for testing purpose.
 ### RM_COMM_4_TEST ###  $self->$sendRecvCleanup($backupSet, $timeStamp);
-### RM_COMM_4_TEST ###  return 0;
+### RM_COMM_4_TEST ###  return;
 
     #send/receive fork
     my $fc = Mojo::IOLoop::ForkCall->new;
-    my $pid = $fc->run(
+    $fc->run(
         #send/receive worker
         $sendRecvCleanup,
         #send/receive worker arguments
         [$self, $backupSet, $timeStamp],
         #send/receive worker callback
         sub {
-            my ($fc, $err, @return) = @_;
-
+            my ($fc, $err) = @_;
+
+            #############################################################
+            #TBD: remove && !$self->terminate as it is not used anymore #
+            #once ForkCall error event gets released!                   #
+            #############################################################
+            $self->zLog->warn('send/receive for ' . $backupSet->{src}
+                . ' failed: ' . $err) if $err && !$self->terminate;
             #send/receive process finished, clear pid from backup set
             $backupSet->{send_pid} = 0;
         }
     );
 
-    return $pid;
+    #spawn event
+    $fc->on(
+        spawn => sub {
+            my ($fc, $pid) = @_;
+
+            print STDERR '# send/receive worker for ' . $backupSet->{src}
+                . " spawned ($pid)\n" if $self->debug;
+            $backupSet->{send_pid} = $pid;
+        }
+    );
+
+    #error event
+    $fc->on(
+        error => sub {
+            my ($fc, $err) = @_;
+
+            $self->zLog->warn($err) if !$self->terminate;
+        }
+    );
 };
 
 my $snapWorker = sub {
@@ -249,33 +278,58 @@ my $snapWorker = sub {
 ### RM_COMM_4_TEST ###  # remove ### RM_COMM_4_TEST ### comments for testing purpose.
 ### RM_COMM_4_TEST ###  $self->$createSnapshot($backupSet, $timeStamp);
 ### RM_COMM_4_TEST ###  $self->$sendWorker($backupSet, $timeStamp);
-### RM_COMM_4_TEST ###  return 0;
+### RM_COMM_4_TEST ###  return;
 
     #snapshot fork
     my $fc = Mojo::IOLoop::ForkCall->new;
-    my $pid = $fc->run(
+    $fc->run(
         #snapshot worker
         $createSnapshot,
         #snapshot worker arguments
         [$self, $backupSet, $timeStamp],
         #snapshot worker callback
         sub {
-            my ($fc, $err, @return) = @_;
+            my ($fc, $err) = @_;
+
+            #############################################################
+            #TBD: remove && !$self->terminate as it is not used anymore #
+            #once ForkCall error event gets released!                   #
+            #############################################################
+            $self->zLog->warn('taking snapshot on ' . $backupSet->{src}
+                . ' failed: ' . $err) if $err && !$self->terminate;
 
             #snapshot process finished, clear pid from backup set
             $backupSet->{snap_pid} = 0;
 
             if ($backupSet->{send_pid}){
-                $self->zLog->info('last send/receive process still running!'
-                    . 'skipping this round. missed snapshots will be sent next time...');
+                $self->zLog->info('last send/receive process on ' . $backupSet->{src}
+                    . ' still running! skipping this round...');
             }
             else{
-                $backupSet->{send_pid} = $self->$sendWorker($backupSet, $timeStamp);
+                $self->$sendWorker($backupSet, $timeStamp);
             }
         }
     );
 
-    return $pid;
+    #spawn event
+    $fc->on(
+        spawn => sub {
+            my ($fc, $pid) = @_;
+
+            print STDERR '# snapshot worker for ' . $backupSet->{src}
+                . " spawned ($pid)\n" if $self->debug;
+            $backupSet->{snap_pid} = $pid;
+        }
+    );
+
+    #error event
+    $fc->on(
+        error => sub {
+            my ($fc, $err) = @_;
+
+            $self->zLog->warn($err) if !$self->terminate;
+        }
+    );
 };
 
 my $createWorkers = sub {
@@ -297,19 +351,20 @@ my $createWorkers = sub {
 
             if ($backupSet->{snap_pid}){
                 $self->zLog->warn('last snapshot process still running! it seems your pre or '
-                    . 'post snapshot script runs too long. snapshot will not be taken this time!');
+                    . 'post snapshot script runs for ages. snapshot will not be taken this time!');
             }
             else{
-                $backupSet->{snap_pid} = $self->$snapWorker($backupSet, $timeStamp);
+                $self->$snapWorker($backupSet, $timeStamp);
             }
-            #get next timestamp when a snapshot has to be taken
-            $timeStamp = $self->zTime->getNextSnapshotTimestamp($backupSet);
 
 ### RM_COMM_4_TEST ###  # remove ### RM_COMM_4_TEST ### comments for testing purpose.
-### RM_COMM_4_TEST ###  return 1;
+### RM_COMM_4_TEST ###  return;
+
+            #get next timestamp when a snapshot has to be taken
+            $timeStamp = $self->zTime->getNextSnapshotTimestamp($backupSet);
 
             #reset timer for next snapshot if not runonce
-            !$self->runonce && Mojo::IOLoop->timer($timeStamp - $self->zTime->getLocalTimestamp() => $cb);
+            Mojo::IOLoop->timer($timeStamp - $self->zTime->getLocalTimestamp() => $cb) if !$self->runonce;
         };
 
         #set timer for next snapshot or run immediately if runonce
@@ -340,7 +395,7 @@ my $daemonize = sub {
     if ($pid){
 
 ### RM_COMM_4_TEST ###  # remove ### RM_COMM_4_TEST ### comments for testing purpose.
-### RM_COMM_4_TEST ###  return 1;
+### RM_COMM_4_TEST ###  return;
 
         exit;
     }
@@ -446,7 +501,7 @@ this program. If not, see L<http://www.gnu.org/licenses/>.
 =head1 AUTHOR
 
 S<Tobias Oetiker E<lt>[email protected]E<gt>>
-S<Dominik Hassler> E<lt>hadfl[email protected]E<gt>>
+S<Dominik Hassler E<lt>hadfl@cpan.orgE<gt>>
 
 =head1 HISTORY
 

lib/ZnapZend/Config.pm

@@ -3,6 +3,7 @@ package ZnapZend::Config;
 use Mojo::Base -base;
 use ZnapZend::ZFS;
 use ZnapZend::Time;
+use Text::ParseWords qw(shellwords);
 
 ### attributes ###
 has debug => sub { 0 };
@@ -11,11 +12,13 @@ has noaction => sub { 0 };
 #mandatory properties
 has mandProperties => sub {
     {
-        enabled     => 'on|off',
-        recursive   => 'on|off',
-        src         => '###dataset###',
-        src_plan    => '###backupplan###',
-        tsformat    => '###tsformat###',
+        enabled       => 'on|off',
+        recursive     => 'on|off',
+        src           => '###dataset###',
+        src_plan      => '###backupplan###',
+        tsformat      => '###tsformat###',
+        pre_znap_cmd  => '###command###',
+        post_znap_cmd => '###command###',
     }
 };
 
@@ -78,6 +81,14 @@ my $checkBackupSets = sub {
                         or die "ERROR: timestamp format not valid. check your syntax\n";
                     last;
                 };
+                /^###command###$/ && do {
+                    last if $backupSet->{$prop} eq 'off';
+
+                    my $file = (shellwords($backupSet->{$prop}))[0];
+                    $self->zfs->fileExistsAndExec($file)
+                        or die "ERROR: property $prop: executable '$file' does not exist or can't be executed\n";
+                    last;
+                };
                 #check if properties are valid
                 my @values = split /\|/, $self->mandProperties->{$prop}, 2;
                 my $value = $backupSet->{$prop};
@@ -319,7 +330,7 @@ this program. If not, see L<http://www.gnu.org/licenses/>.
 =head1 AUTHOR
 
 S<Tobias Oetiker E<lt>[email protected]E<gt>>
-S<Dominik Hassler> E<lt>hadfl[email protected]E<gt>>
+S<Dominik Hassler E<lt>hadfl@cpan.orgE<gt>>
 
 =head1 HISTORY
 

lib/ZnapZend/Time.pm

@@ -329,7 +329,7 @@ this program. If not, see L<http://www.gnu.org/licenses/>.
 =head1 AUTHOR
 
 S<Tobias Oetiker E<lt>[email protected]E<gt>>
-S<Dominik Hassler> E<lt>hadfl[email protected]E<gt>>
+S<Dominik Hassler E<lt>hadfl@cpan.orgE<gt>>
 
 =head1 HISTORY
 

lib/ZnapZend/ZFS.pm

@@ -144,7 +144,7 @@ sub snapshotExists {
 
     ($remote, $snapshot) = $splitHostDataSet->($snapshot);
     my @ssh = $self->$buildRemote($remote,
-        [qw(zfs list -H -o name -t snapshot -r -d 1), $snapshot]);
+        [qw(zfs list -H -o name -t snapshot -d 1), $snapshot]);
 
     print STDERR '# ' . join(' ', @ssh) . "\n" if $self->debug;
     open my $snapshots, '-|', @ssh
@@ -181,7 +181,7 @@ sub listSnapshots {
 
     ($remote, $dataSet) = $splitHostDataSet->($dataSet);
     my @ssh = $self->$buildRemote($remote,
-        [qw(zfs list -t snapshot -o name -s name -r -d 1), $dataSet]);
+        [qw(zfs list -t snapshot -o name -s creation -d 1), $dataSet]);
 
     print STDERR '# ' . join(' ', @ssh) . "\n" if $self->debug;
     open my $snapshots, '-|', @ssh or die "ERROR: cannot get snapshots on $dataSet\n";
@@ -617,7 +617,7 @@ this program. If not, see L<http://www.gnu.org/licenses/>.
 =head1 AUTHOR
 
 S<Tobias Oetiker E<lt>[email protected]E<gt>>
-S<Dominik Hassler> E<lt>hadfl[email protected]E<gt>>
+S<Dominik Hassler E<lt>hadfl@cpan.orgE<gt>>
 
 =head1 HISTORY
 

t/zfs

@@ -68,8 +68,8 @@ org.znapzend:dst_a          root\@remote:remote/destination
 org.znapzend:dst_fail       backup/destfail
 org.znapzend:mbuffer        $FindBin::Bin/mbuffer
 org.znapzend:mbuffer_size   100M
-org.znapzend:pre_znap_cmd   echo 'pre znap command'
-org.znapzend:post_znap_cmd  echo 'post znap command'
+org.znapzend:pre_znap_cmd   /bin/echo 'pre znap command'
+org.znapzend:post_znap_cmd  /bin/echo 'post znap command'
 ZFS_GET_END
 
         exit;