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 mountGeli runCmd $logFileName $displayLogsOnConsole);
+# if set, will not actually write files to disk
+my $DEBUG = 0;
 # set the log file to be next to this script
 $logFileName = "$FindBin::Bin/sneakernet.log";
 # log only for one run
 unlink ( $logFileName ) if -f $logFileName;
    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 = [ runCmd( "zfs", "list", "-rt", "snap", "-H", "-o", "name", $config->{datasets}->{$dataset}->{source} ) ];
+      my $sourceList = [ runCmd( "zfs list -rt snap -H -o name $config->{datasets}->{$dataset}->{source} " ) ];
       # process dataset here
       my $commands = makeReplicateCommands($sourceList, $statusList, $newStatus );
       if ( %$commands ) {
          foreach my $cmd ( keys %$commands ) {
             my $command = $commands->{$cmd};
             $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}/" . replaceSlashWithDot($cmd);
             logMsg("Running command: $command");
-            #runCmd( split( /\s+/, $cmd ) );
+            runCmd(  $command  ) unless $DEBUG;
+         }
       } else {
          logMsg( "Nothing to do for $dataset" );
+      }
+   }
    return $newStatus;
+}
+# clean all files from a directory, but not any subdirectories
+sub cleanDirectory {
+   my $dirname = shift;
+   logMsg( "Cleaning up $dirname of all files" );
+   # clean up a directory
+   opendir( my $dh, $dirname ) || fatalError( "Can not open $dirname: #!" );
+   # get all file names, but leave directories alone
+   my @files = map{ $dirname . "/$_" } grep { -f "$dirname/$_" } readdir($dh);
+   closedir $dh;
+   foreach my $file (@files) {
+      unlink $file or warn "Could not unlink $file: #!\n";
+   }
+   return;
+ }
 # how to handle a fatal error
 sub fatalError {
    my $message = shift;
    logMsg( $message );
    die;
    unless $config->{transport}->{mount_point} =  mountDriveByLabel( $config->{transport}->{disk_label}, $config->{transport}->{mount_point}, $config->{transport}->{timeout} );
 my $servername = `hostname -s`;
 chomp $servername;
 if ( $servername eq $config->{source_server}->{hostname} ) {
-    logMsg "Running as source server\n";
+    logMsg "Running as source server";
+    # remove all files from transport disk, but leave all subdirectories alone
+    cleanDirectory( $config->{transport}->{mount_point} );
     my $statusList = getStatusFile($config->{status_file});
     $statusList = doSourceReplication($config, $statusList);
     writeStatusFile($config->{status_file}, $statusList);
     # source server logic here
 } elsif ( $servername eq $config->{target_server}->{hostname} ) {
-    logMsg "Running as target server\n";
+    logMsg "Running as target server";
+    die "Target Server code not complete\n";
     die "GELI target server logic not yet implemented\n" if ( defined $config->{target_server}->{geli} );
     mountGeli( $config->{target_server}->{geli} ) if ( defined $config->{target_server}->{geli} );
 } else {
     logMsg "This server ($servername) is neither source nor target server as per config\n";
     die;
+}
 # unmount the sneakernet drive
 `umount $config->{transport}->{mount_point}`;
 # and remove the directory
-unlink $config->{transport}->{mount_point};
+rmdir $config->{transport}->{mount_point};
-die "Source and target server logic not yet implemented\n";
-#my $newStatus = [];
-#foreach my $dataset ( sort keys %{$config->{datasets}} ) {
-#   logMsg("Processing dataset '$dataset'");
-#   my $sourceList = [ runCmd( "zfs", "list", "-rt", "snap", "-H", "-o", "name", $config->{datasets}->{$dataset}->{source} ) ];
-#   # process dataset here
-#   my $commands = makeReplicateCommands($sourceList, $targetList, $newStatus );
-#   foreach my $cmd ( @$commands ) {
-#      $cmd .= " > $config->{transport}->{mount_point}/" . $dataset;
-#      logMsg("Running command: $cmd");
-#      #runCmd( split( /\s+/, $cmd ) );
-#   }
-#}
 ;
 #`cat $config->{input} | openssl enc -aes-256-cbc -K $config->{key} -iv $config->{IV} > $config->{output}`;

Subversion Repositories zfs_utils

(root)/trunk/sneakernet/sneakernet – Rev 31 → 33