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

 # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# sneakernet.pl
+# sneakernet
 # Script to perform sneakernet replication of ZFS datasets between two servers
 # using an external transport drive.
 # Uses ZFS send/receive to replicate datasets to/from the transport drive.
 # Optionally uses symmetric encryption to encrypt datasets during transport.
 # On the target server, can optionally use GELI to encrypt the datasets on disk.
 # Version: 1.0 RWR 2025-12-15
 # Tested and ready for initial release
+#
 # Version: 1.0.1 RWR 2025-12-15
 # Added verbose logging control to logMsg calls, controlled by ZFS_Utils::$verboseLoggingLevel
+#
+# Version: 1.1 RWR 2025-12-17
+# Added filtering so only the snapshots for the current dataset are considered when
+# generating replication commands.
+# added test.source.status (in script directory) file for dry-run testing of source replication.
+# changed default name of status file to sneakernet_target.status to avoid confusion.
+# added more logging of source/target snapshots in doSourceReplication for debugging.
+#
+# Version: 1.1.1 RWR 2025-12-18
+# Fixed makeReplicateCommands call to pass actual dataset name from config rather than config key.
+# Updated documentation to clarify how makeReplicateCommands filters snapshots by parent+dataset path
+# to avoid false matches with similarly-named datasets in different locations.
 use strict;
 use warnings;
-our $VERSION = '1.0.1';
+our $VERSION = '1.1.1';
 use File::Basename;
 use FindBin;
 use lib "$FindBin::Bin/..";
 use Data::Dumper;
 my $configFileName = "$scriptFullPath.conf.yaml";
 my $config = {
    'dryrun' => 0,
    'verbosity' => 1,
-   # file created on source server to track last copyed dataset
+   # file created on source server to track last copied dataset, assuming
+   # the import goes well on the target server
-   'status_file' => "$scriptFullPath.status",
+   'status_file' => "$scriptDirectory/sneakernet_target.status",
    'log_file' => "$scriptFullPath.log",
    #information about source server
    'source' => {
       'hostname' => '', # used to see if we are on source
       'poolname' => 'pool', # name of the ZFS pool to export
 ##   $statusList - ARRAYREF of previously replicated snapshot full names (used to compute incremental sends)
 ##
 ## Behavior:
 ##   - Iterates over datasets defined in `$config->{datasets}`.
 ##   - For each dataset, enumerates available snapshots on the source and calls
-##     `makeReplicateCommands` to produce zfs send commands.
+##     `makeReplicateCommands` (from ZFS_Utils) to produce zfs send commands.
+##   - `makeReplicateCommands` filters snapshots by matching parent+dataset path (e.g., ^pool/dataset(?:/|@))
+##     to avoid false matches with similarly-named datasets, and intelligently determines whether to use
+##     recursive vs per-filesystem sends and incremental vs full sends based on snapshot availability.
 ##   - Commands are optionally piped through `openssl enc` when `transport.encryption.key` is set.
 ##   - The output is written to files on the transport mount point (one file per dataset snapshot set).
 ##   - Respects `$config->{dryrun}`: no commands are executed when dryrun is enabled.
 ##
 ## Returns: ARRAYREF `$newStatus` containing updated status lines (latest snapshots per dataset).
 sub doSourceReplication {
-   my ($config, $statusList) = @_;
+   my ($config, $targetList) = @_;
    my $newStatus = [];
    foreach my $dataset ( sort keys %{$config->{datasets}} ) {
       logMsg("Processing dataset '$dataset'") if $verboseLoggingLevel >= 1;
       # get list of all snapshots on dataset
       my $sourceList;
-      if ( -e "$scriptDirectory/test.status") {
+      if ( -e "$scriptDirectory/test.source.status" && $config->{dryrun} ) {
+         logMsg("Using test.source.status file for source snapshots in dry-run mode") if $verboseLoggingLevel >= 2;
-         $sourceList = getStatusFile( "$scriptDirectory/test.status" );
+         $sourceList = getStatusFile( "$scriptDirectory/test.source.status" );
       } else {
-         $sourceList = [ runCmd( "zfs list -rt snap -H -o name $config->{datasets}->{$dataset}->{source}" ) ];
+         $sourceList = [ runCmd( "zfs list -rt snap -H -o name $config->{datasets}->{$dataset}->{source}/$config->{datasets}->{$dataset}->{dataset}" ) ];
+      }
+      if ($verboseLoggingLevel >= 5) {
+         logMsg("Source snapshots for dataset '$dataset': " . join( ', ', sort @$sourceList ) );
+         logMsg("Target snapshots for dataset '$dataset': " . join( ', ', sort @$targetList ) );
+      }
-      # process dataset here
+      # process dataset here using makeReplicateCommands from ZFS_Utils
+      # $dataset here is the config key; the actual dataset name is in $config->{datasets}->{$dataset}->{dataset}
       my $commands = makeReplicateCommands(
                         $sourceList,
-                        $statusList,
+                        $targetList,
-                        $dataset,
+                        $config->{datasets}->{$dataset}->{dataset},
                         $config->{datasets}->{$dataset}->{source},
                         $config->{datasets}->{$dataset}->{target},
                         $newStatus
                      );
       if ( %$commands ) {
 ##     to shut down the machine (honors `$config->{dryrun}`).
 sub cleanup{
    my ( $config, $message ) = @_;
    # add disk space utilization information on transport to the log
    logMsg( "Disk space utilization on transport disk:\n" . runCmd( "df -h $config->{transport}->{mount_point}" ) . "\n" )
-      if $verboseLoggingLevel >= 1;
+      if -d $config->{transport}->{mount_point} && $verboseLoggingLevel >= 1;
    # add information about the server (zpools) to the log
    my $servername = `hostname -s`;
    chomp $servername;
-   logMsg( "Zpools on server $servername:\n" . join( "\n", runCmd( "zpool list" ) ) . "\n" ) if $verboseLoggingLevel >= 1;
+   logMsg( "Zpools on server $servername:\n" . join( "\n", runCmd( "zpool list" ) ) . "\n" ) if `which zpool` && $verboseLoggingLevel >= 1;
    $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} ) unless $config->{dryrun};
    sendReport( $config->{$config->{runningAs}}->{report}, $message, $config->{log_file} );
 $config->{runningAs} = $servername eq $config->{source}->{hostname} ? 'source' :
                 $servername eq $config->{target}->{hostname} ? 'target' : 'unknown';
 # mount the transport drive, fatal error if we can not find it
 fatalError( "Unable to mount tranport drive with label $config->{transport}->{label}", $config, \&cleanup )
-   unless $config->{transport}->{mount_point} =  mountDriveByLabel( $config->{transport} );
+   unless $config->{dryrun} or $config->{transport}->{mount_point} =  mountDriveByLabel( $config->{transport} );
 # main program logic
 if ( $config->{runningAs} eq 'source' ) {
     logMsg "Running as source server" if $verboseLoggingLevel >= 1;
     # remove all files from transport disk, but leave all subdirectories alone

Subversion Repositories zfs_utils

(root)/trunk/sneakernet/sneakernet – Rev 57 → 60