WebSVN – zfs_utils – Diff – /trunk/ZFS_Utils.pm

 #   makeReplicateCommands: create zfs send commands for replication based on snapshot lists
 # Exported functions and variables
-our @EXPORT_OK = qw(loadConfig shredFile mountDriveByLabel mountGeli logMsg runCmd makeReplicateCommands sendReport $logFileName $displayLogsOnConsole);
+our @EXPORT_OK = qw(loadConfig shredFile mountDriveByLabel mountGeli logMsg runCmd makeReplicateCommands sendReport $logFileName $displayLogsOnConsole $lastRunError);
 our $VERSION = '0.2';
 our $logFileName = '/tmp/zfs_utils.log'; # this can be overridden by the caller, and turned off with empty string
 our $displayLogsOnConsole = 1; # if non-zero, log messages are also printed to console
 our $merge_stderr = 0; # if set to 1, stderr is captured in runCmd
+our $lastRunError = 0; # tracks the last error code from runCmd
 # Execute a command and return its output.
 # If called in scalar context, returns the full output as a single string.
 # If called in list context, returns the output split into lines.
 # If $merge_stderr is true (default), stderr is merged into stdout (only for scalar commands).
    my $output = '';
    logMsg( "Running command [$cmd]" );
    $cmd .= ' 2>&1' if $merge_stderr;
    $output = `$cmd`;
+   $lastRunError = $?;
+   if ( $lastRunError ) {
-   if ($? == -1) {
+      if ($? == -1) {
-      logMsg( "failed to execute: $!");
+         logMsg( "failed to execute: $!");
-      return ''
+         return '';
-   }
-   elsif ($? & 127) { # fatal error, exit program
+      } elsif ($? & 127) { # fatal error, exit program
-      logMsg( sprintf( "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' ) );
+         logMsg( sprintf( "child died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without' ) );
-      die;
+         die;
-   }
-   else {
+      } elsif ($? >> 8) { # it had some return code other than 0
-      logMsg( sprintf( "child exited with value %d\n", $? >> 8 ) );
+         logMsg( sprintf( "child exited with value %d\n", $? >> 8 ) );
+      }
+   }
    $output //= '';
    if (wantarray) {
       return $output eq '' ? () : split(/\n/, $output);
    # default to /mnt/label if not provided
    $driveInfo->{mountPath} //= "/mnt/$driveInfo->{label}"; # this is where we'll mount it if we find it
    $driveInfo->{filesystem} //= 'ufs'; # default to mounting ufs
    # The location for the label depends on filesystem. Only providing access to ufs and msdos here for safety.
    # gpt labeled drives for ufs are in /dev/gpt/, for msdosfs in /dev/msdosfs/
-   $driveInfo->{mountPath} = $driveInfo->{filesystem} eq 'msdos' ? "/dev/msdosfs/$driveInfo->{label}" : "/dev/gpt/$driveInfo->{label}";
+   $driveInfo->{label} = $driveInfo->{filesystem} eq 'msdos' ? "/dev/msdosfs/$driveInfo->{label}" : "/dev/gpt/$driveInfo->{label}";
    # drive already mounted, just return the path
-   return $driveInfo->{mountPath} if ( runCmd( "mount | grep '$driveInfo->{mountPath}'" ) );
+   my $output = runCmd( "mount | grep '$driveInfo->{mountPath}'" );
+   return $driveInfo->{mountPath} if ( $lastRunError == 0 ); # grep found it for us
    # default to 10 minutes (600 seconds) if not provided
    $driveInfo->{timeout} //= 600;
    # default to checking every minute if not provided
    $driveInfo->{check_interval} //= 15;
    # wait up to $timeout seconds for device to appear, checking every 10 seconds
    while ( $driveInfo->{timeout} > 0 ) {
       if ( -e "$driveInfo->{label}" ) {
          last;
       } else {
+         print "Waiting for drive labeled $driveInfo->{label}\n";
          sleep $driveInfo->{check_interval};
          $driveInfo->{timeout} -= $driveInfo->{check_interval};
-         print "Waiting for drive labeled $driveInfo->{label}\n";
+      }
+    }
     # if we found it, mount and return mount path
     if ( -e "$driveInfo->{label}" ) {
        # ensure mount point
        unless ( -d $driveInfo->{mountPath} || make_path($driveInfo->{mountPath}) ) {
          logMsg("Failed to create $driveInfo->{mountPath}: $!");
          return '';
+       }
-       # mount device (let mount detect filesystem)
+       # mount device
-       unless ( runCmd( "mount -t $driveInfo->{filesystem} $driveInfo->{label} $driveInfo->{mountPath}" ) ) {
+       runCmd( "mount -t $driveInfo->{filesystem} $driveInfo->{label} $driveInfo->{mountPath}" );
+       if ( $lastRunError ) {
          logMsg("Failed to mount $driveInfo->{label} on $driveInfo->{mountPath}: $!");
          return '';
+       }
        return $driveInfo->{mountPath};
     } else {
       my %from_names = map { $_ => 1 } grep { defined $_ } @from_values;
       my $single_from_name = (keys %from_names == 1) ? (keys %from_names)[0] : undef;
       if ($any_from_missing) {
          # full recursive send from root
-         $commands{'root_fs'} = sprintf('zfs send -R %s@%s', $root_fs, $single_to_name);
+         $commands{$root_fs} = sprintf('zfs send -R %s@%s', $root_fs, $single_to_name);
+      }
       elsif ($single_from_name) {
          # incremental recursive send, but don't do it if they are the same
          $commands{$root_fs} = sprintf('zfs send -R -I %s@%s %s@%s',
                            $root_fs, $single_from_name, $root_fs, $single_to_name)
 # $subject is the email subject
 # $logFile is the path to the log file to send/copy
 sub sendReport {
    my ( $reportConfig, $subject, $logFile ) = @_;
    return unless defined $reportConfig;
+   logMsg( "Beginning sendReport" );
+   # if they have set an e-mail address, try to e-mail the report
    if ( defined $reportConfig->{email} && $reportConfig->{email} ne '' ) {
+      logMsg( "Sending report via e-mail to $reportConfig->{email}");
       sendEmailReport( $reportConfig->{email}, $subject, $logFile );
+   }
+   # if targetDrive defined and there is a valid label for it, try to mount it and write the report there
+   if ( defined $reportConfig->{targetDrive} && defined $reportConfig->{targetDrive}->{label} && $reportConfig->{targetDrive}->{label} ) {
-   if ( defined $reportConfig->{targetDrive} ) {
+      logMsg( "Saving report to disk with label $reportConfig->{targetDrive}->{label}" );
       my $mountPoint = mountDriveByLabel( $reportConfig->{targetDrive}->{label}, $reportConfig->{targetDrive}->{mount_point}, 300 );
-      if ( defined $mountPoint ) {
+      if ( defined $mountPoint && $mountPoint ) {
          copyReportToDrive( $logFile, $mountPoint );
          `umount $mountPoint`;
          rmdir $mountPoint;
       } else {
          logMsg( "Warning: could not mount report target drive with label '$reportConfig->{targetDrive}->{label}'" );
 # $logFile is the path to the log file to send.
 # Does nothing if any parameter is invalid.
 sub sendEmailReport {
    my ( $to, $subject, $logFile ) = @_;
    return unless defined $to && $to ne '';
-   return unless defined $subject && $subject ne '';
+   $subject //= 'Sneakernet Replication Report from ' . `hostname`;
-   return unless defined $logFile && -e $logFile;
+   $logFile //= '';
    logMsg( "Sending email report to $to with subject '$subject'" );
    open my $mailfh, '|-', '/usr/sbin/sendmail -t' or do {
       logMsg( "Could not open sendmail: $!" );
       return;
    print $mailfh "To: $to\n";
    print $mailfh "Subject: $subject\n";
    print $mailfh "MIME-Version: 1.0\n";
    print $mailfh "Content-Type: text/plain; charset=\"utf-8\"\n";
    print $mailfh "\n"; # end of headers
+   print $mailfh "Following is the report for replication\n\n";
-   open my $logfh, '<', $logFile or do {
+   if ( -e $logFile && open my $logfh, '<', $logFile ) {
-      logMsg( "Could not open log file $logFile for reading: $!" );
+      while ( my $line = <$logfh> ) {
+         print $mailfh $line;
+      }
-      close $mailfh;
+      close $logfh;
-      return;
+   } else {
+      logMsg( "Could not open log file [$logFile] for reading: $!" );
    };
-   while ( my $line = <$logfh> ) {
-      print $mailfh $line;
-   }
-   close $logfh;
    close $mailfh;
+}
 ;

Subversion Repositories zfs_utils

(root)/trunk/ZFS_Utils.pm – Rev 35 → 37