patrick/zfs_autobackup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix #217

Browse Source
This commit is contained in:
Edwin Eefting
2023-09-26 21:36:03 +02:00
parent bdc156e48d
commit de898fc258
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
zfs_autobackup/ZfsDataset.py
View File

@ -1104,9 +1104,6 @@ class ZfsDataset:
# check if we can resume # check if we can resume
resume_token = self._validate_resume_token(target_dataset, start_snapshot) resume_token = self._validate_resume_token(target_dataset, start_snapshot)
# rollback target to latest?
if rollback:
target_dataset.rollback()
(active_filter_properties, active_set_properties) = self.get_allowed_properties(filter_properties, set_properties) (active_filter_properties, active_set_properties) = self.get_allowed_properties(filter_properties, set_properties)
@ -1121,12 +1118,18 @@ class ZfsDataset:
# now actually transfer the snapshots # now actually transfer the snapshots
prev_source_snapshot = common_snapshot prev_source_snapshot = common_snapshot
source_snapshot = start_snapshot source_snapshot = start_snapshot
do_rollback=rollback
while source_snapshot: while source_snapshot:
target_snapshot = target_dataset.find_snapshot(source_snapshot) # still virtual target_snapshot = target_dataset.find_snapshot(source_snapshot) # still virtual
# does target actually want it? # does target actually want it?
if target_snapshot not in target_obsoletes: if target_snapshot not in target_obsoletes:
#do the rollback, one time at first transfer
if do_rollback:
target_dataset.rollback()
do_rollback = False
source_snapshot.transfer_snapshot(target_snapshot, features=features, source_snapshot.transfer_snapshot(target_snapshot, features=features,
prev_snapshot=prev_source_snapshot, show_progress=show_progress, prev_snapshot=prev_source_snapshot, show_progress=show_progress,
filter_properties=active_filter_properties, filter_properties=active_filter_properties,