Handle not-sending of not-enabled datasets (#626)

* lib/ZnapZend.pm: createSnapshot(): be pedantic about "implicit value of org.znapzend:enabled" for sub-datasets Signed-off-by: Jim Klimov <[email protected]> * lib/ZnapZend.pm: createSnapshot(): update comments about creation and cleanup of snapshots on enabled=off sub-datasets Signed-off-by: Jim Klimov <[email protected]> * lib/ZnapZend.pm: refactor listDisabledSourceDescendants() out of createSnapshot() so it can also be used in sendRecvCleanup() Signed-off-by: Jim Klimov <[email protected]> * lib/ZnapZend.pm: refactor listDisabledSourceDescendants() calls to be done in refreshBackupPlans() once Track the list of names as @{$backupSet->{srcDisabledDescendants}} Signed-off-by: Jim Klimov <[email protected]> * lib/ZnapZend.pm: sendRecvCleanup(): skip sending of disabled datasets Signed-off-by: Jim Klimov <[email protected]> * lib/ZnapZend.pm: sendRecvCleanup(): clarify the message when we skip a not-enabled dataset Signed-off-by: Jim Klimov <[email protected]> * lib/ZnapZend.pm: sendRecvCleanup(): wrap the long source code line to emit a debug message about sending (or not) a dataset Signed-off-by: Jim Klimov <[email protected]> --------- Signed-off-by: Jim Klimov <[email protected]> Co-authored-by: Tobias Oetiker <[email protected]>
oetiker · Mar 12, 2024 · aa0bfed · aa0bfed
1 parent e690f41
commit aa0bfed
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/ZnapZend.pm b/lib/ZnapZend.pm
@@ -600,8 +600,14 @@ my $sendRecvCleanup = sub {
             my $dstDataSet = $srcDataSet;
             $dstDataSet =~ s/^\Q$backupSet->{src}\E/$backupSet->{$dst}/;
 
-            $self->zLog->debug('sending snapshots from ' . $srcDataSet . ' to ' . $dstDataSet . ((grep (/^\Q$srcDataSet\E$/, @dataSetsExplicitlyDisabled)) ? ": not enabled, should be skipped" : ""));
-            {
+            my $srcDataSetDisabled = (grep (/^\Q$srcDataSet\E$/, @dataSetsExplicitlyDisabled));
+            $self->zLog->debug('sending snapshots from ' . $srcDataSet . ' to ' . $dstDataSet .
+                ($srcDataSetDisabled ? ": not enabled, skipped" : ""));
+            if ($srcDataSetDisabled) {
+                next;
+            }
+
+            {   # scoping
                 local $@;
                 eval {
                     local $SIG{__DIE__};