norohind/zfs_autobackup
1
0
Fork 0
forked from third-party-mirrors/zfs_autobackup
Code Pull Requests Activity

wip

Browse Source
This commit is contained in:
Edwin Eefting 2019-10-28 15:05:29 +01:00
parent d80a636b12
commit ff55a6d413
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
zfs_autobackup
View File

@ -970,18 +970,17 @@ class ZfsDataset():
#if something is resumed, fix the holds at this point #if something is resumed, fix the holds at this point
if resumed: if resumed:
#hold the current commons, relase the previous ones #hold the current commons, relase the previous ones
common_snapshot.hold() if common_snapshot:
target_dataset.find_snapshot(common_snapshot).hold() common_snapshot.hold()
target_dataset.find_snapshot(common_snapshot).hold()
prev_target_snapshot=target_dataset.find_our_prev_snapshot(common_snapshot)
if prev_target_snapshot:
prev_target_snapshot.release()
prev_source_snapshot=self.find_snapshot(prev_target_snapshot)
if prev_source_snapshot:
prev_source_snapshot.release()
prev_target_snapshot=target_dataset.find_our_prev_snapshot(common_snapshot)
if prev_target_snapshot:
prev_target_snapshot.release()
prev_source_snapshot=self.find_snapshot(prev_target_snapshot)
if prev_source_snapshot:
prev_source_snapshot.release()
#create virtual target snapshots #create virtual target snapshots
@ -1018,7 +1017,7 @@ class ZfsDataset():
prev_source_snapshot=common_snapshot prev_source_snapshot=common_snapshot
source_snapshot=start_snapshot source_snapshot=start_snapshot
while source_snapshot: while source_snapshot:
target_snapshot=target_dataset.find_snapshot(source_snapshot.snapshot_name) #"virtual" target_snapshot=target_dataset.find_snapshot(source_snapshot) #"virtual"
#does target actually want it? #does target actually want it?
if target_snapshot in target_keeps: if target_snapshot in target_keeps:
@ -1029,7 +1028,7 @@ class ZfsDataset():
source_snapshot.hold() source_snapshot.hold()
if prev_source_snapshot: if prev_source_snapshot:
prev_source_snapshot.release() prev_source_snapshot.release()
target_dataset.find_snapshot(prev_source_snapshot.snapshot_name) target_dataset.find_snapshot(prev_source_snapshot).release()
#we may destroy the previous snapshot now, if we dont want it anymore #we may destroy the previous snapshot now, if we dont want it anymore
if prev_source_snapshot and (prev_source_snapshot not in source_keeps): if prev_source_snapshot and (prev_source_snapshot not in source_keeps):