WebSVN – zfs_utils – Diff – /trunk/sneakernet/sneakernet

 use FindBin;
 use lib "$FindBin::Bin/..";
 use Data::Dumper;
 use ZFS_Utils qw(loadConfig shredFile logMsg makeReplicateCommands mountDriveByLabel unmountDriveByLabel mountGeli runCmd sendReport fatalError cleanDirectory $logFileName $displayLogsOnConsole);
+use Getopt::Long qw(GetOptions);
+Getopt::Long::Configure ("bundling");
 my $scriptDirectory = $FindBin::RealBin;
 my $scriptFullPath = "$scriptDirectory/" . $FindBin::Script;
-# if set, will not actually write files to disk
-my $DEBUG = 1;
 # display all log messages on console in addition to the log file
 $displayLogsOnConsole = 1;
 my $configFileName = "$scriptFullPath.conf.yaml";
 my $config = {
+   'dryrun' => 0,
+   'verbosity' => 1,
    # file created on source server to track last copyed dataset
    'status_file' => "$scriptFullPath.status",
    'log_file' => "$scriptFullPath.log",
    #information about source server
    'source' => {
    my ($config, $statusList) = @_;
    my $newStatus = [];
    foreach my $dataset ( sort keys %{$config->{datasets}} ) {
       logMsg("Processing dataset '$dataset'");
       # get list of all snapshots on dataset
+      my $sourceList;
+      if ( -e "$scriptDirectory/test.status") {
-      my $root = $config->{datasets}->{$dataset}->{source} . '/' . $config->{datasets}->{$dataset}->{dataset};
+         $sourceList = getStatusFile( "$scriptDirectory/test.status" );
+      } else {
-      my $sourceList = [ runCmd( "zfs list -rt snap -H -o name $root" ) ];
+         $sourceList = [ runCmd( "zfs list -rt snap -H -o name $config->{datasets}-{$dataset}->{source}" ) ];
+      }
       # remove the parent part, leave the dataset itself
-      $sourceList =~ s|$config->{datasets}->{$dataset}->{source}/||;
+      $sourceList =~ s|/||;
       # process dataset here
-      my $commands = makeReplicateCommands( $sourceList, $statusList, $newStatus );
+      my $commands = makeReplicateCommands(
+                        $sourceList,
+                        $statusList,
+                        $dataset,
+                        $config->{datasets}->{$dataset}->{source},
+                        $config->{datasets}->{$dataset}->{target},
+                        $newStatus
+                     );
       if ( %$commands ) {
          foreach my $cmd ( keys %$commands ) {
             my $command = $commands->{$cmd};
             my $outputFile = $cmd;
-            $outputFile =~ s/^$root//;
+            #$outputFile =~ s/^$root//;
             $outputFile = replaceSlashWithDot($outputFile);
             #$command .= " | openssl enc -aes-256-cbc -K $config->{transport}->{encryption}->{key} -iv $config->{transport}->{encryption}->{IV} " if $config->{transport}->{encryption}->{key};
-            $command .= " > $config->{transport}->{mount_point}/" . $outputFile;
+            $command .= " > $config->{transport}->{mount_point}/" . $cmd;
             logMsg("Running command: $command");
-            runCmd(  $command  ) unless $DEBUG;
+            runCmd(  $command  ) unless $config->{dryrun};
+         }
       } else {
          logMsg( "Nothing to do for $dataset" );
+      }
+   }
    chomp $servername;
    logMsg( "Zpools on server $servername:\n" . join( "\n", runCmd( "zpool list" ) ) . "\n" );
    $config->{$config->{runningAs}}->{report}->{subject} //= "Replication Report for $config->{runningAs} server $servername";
    $message //= "Replication completed on $config->{runningAs} server $servername.";
    # unmount the sneakernet drive
-   unmountDriveByLabel( $config->{transport} );
+   unmountDriveByLabel( $config->{transport} ) unless $config->{dryrun};
    sendReport( $config->{$config->{runningAs}}->{report}, $message, $config->{log_file} );
    # If they have requested shutdown, do it now
    if ( $config->{$config->{runningAs}}->{shutdown_after_replication} ) {
       logMsg( "Shutting down target server as per configuration" );
-      runCmd( "shutdown -p now" ) unless $DEBUG;
+      runCmd( "shutdown -p now" ) unless $config->{dryrun};
+   }
+}
 # update the target datasets from the files on the transport drive
 sub updateTarget {
 # If a YAML config file exists next to the script, load and merge it
 $config = loadConfig($configFileName, $config );
 exit 1 unless keys %$config;
+# parse CLI options
+GetOptions( $config,
+   'dryrun|n',
+   'verbose|v+',
+   'version|V',
+   'help|h',
+) or do { print "Invalid options\n"; exit 2 };
+if (defined ($config->{help})) {
+   print "Usage: $FindBin::Script [--dryrun] [--verbose] [--help]\n";
+   print "  --dryrun, -n   Run in dry-run mode (no writes)\n";
+   print "  --verbose, -v  Run in verbose mode (more v's mean more verbose)\n";
+   print "  --version, -V  Display version number\n";
+   exit 0;
+} elsif (defined $config->{version}) {
+   print "$FindBin::Script v$VERSION\n";
+   exit 0;
+}
 # set some defaults
 $config->{'status_file'} //= "$scriptFullPath.status";
 # set log file name for sub logMsg in ZFS_Utils, and remove the old log if it exists
 # Log file is only valid for one run
 $logFileName = $config->{'log_file'} //= "$scriptFullPath.log";
 #cleanup( $config, "Testing" );
 # mount the transport drive, fatal error if we can not find it
 fatalError( "Unable to mount tranport drive with label $config->{transport}->{disk_label}", $config, \&cleanup )
-   unless $config->{transport}->{mount_point} =  mountDriveByLabel( $config->{transport} );
+   unless $config->{dryrun} or $config->{transport}->{mount_point} =  mountDriveByLabel( $config->{transport} );
-# mail program logic
+# main program logic
 if ( $config->{runningAs} eq 'source' ) {
     logMsg "Running as source server";
     # remove all files from transport disk, but leave all subdirectories alone
    fatalError( "Failed to clean transport directory $config->{transport}->{mount_point}", $config, \&cleanup )
-      unless cleanDirectory( $config->{transport}->{mount_point} );
+      unless $config->{dryrun} or cleanDirectory( $config->{transport}->{mount_point} );
     my $statusList = getStatusFile($config->{status_file});
     $statusList = doSourceReplication($config, $statusList);
-    writeStatusFile($config->{status_file}, $statusList);
+    writeStatusFile($config->{status_file}, $statusList) unless $config->{dryrun};
 } elsif ( $config->{runningAs} eq 'target' ) {
     logMsg "Running as target server";
     mountGeli( $config->{target}->{geli} ) if ( defined $config->{target}->{geli} );
     updateTarget( $config );
 } else {

Subversion Repositories zfs_utils

(root)/trunk/sneakernet/sneakernet – Rev 43 → 44