third-party-mirrors/zfs_autobackup
1
0
Fork 1
mirror of https://github.com/psy0rz/zfs_autobackup.git synced 2025-04-13 22:47:12 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Edwin Eefting 2019-10-24 00:17:50 +02:00
parent 98b3902b4c
commit 66d7beb7ac
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zfs_autobackup
View File

@ -503,7 +503,7 @@ class ZfsDataset():
@property @property
def filesystem_name(self): def filesystem_name(self):
"""filesystem part of the name (before the @)""" """filesystem part of the name (before the @)"""
(filesystem, snapshot_name)=self.name.split("@") ( filesystem, )=self.name.split("@")
return(filesystem) return(filesystem)
@ -537,7 +537,7 @@ class ZfsDataset():
"""find our previous snapshot in this dataset. None if it doesnt exist""" """find our previous snapshot in this dataset. None if it doesnt exist"""
if self.is_snapshot(): if self.is_snapshot():
raise(Exception("Please call this on a dataset.") raise(Exception("Please call this on a dataset."))
try: try:
index=self.our_snapshots.index(snapshot) index=self.our_snapshots.index(snapshot)
@ -553,7 +553,7 @@ class ZfsDataset():
"""find our next snapshot in this dataset. None if it doesnt exist""" """find our next snapshot in this dataset. None if it doesnt exist"""
if self.is_snapshot(): if self.is_snapshot():
raise(Exception("Please call this on a dataset.") raise(Exception("Please call this on a dataset."))
try: try:
index=self.our_snapshots.index(snapshot) index=self.our_snapshots.index(snapshot)
@ -830,7 +830,7 @@ class ZfsDataset():
if 'receive_resume_token' in target_dataset.properties: if 'receive_resume_token' in target_dataset.properties:
self.verbose("resuming") self.verbose("resuming")
#just send and recv on dataset instead of snapshot object. #just send and recv on dataset instead of snapshot object.
pipe=self.send_pipe(show_progress=show_progress, resume_token=resume_token) pipe=self.send_pipe(show_progress=show_progress, resume_token=target_dataset.properties['receive_resume_token'])
target_dataset.recv_pipe(pipe,resume=True) target_dataset.recv_pipe(pipe,resume=True)
@ -851,7 +851,7 @@ class ZfsDataset():
#target has nothing yet #target has nothing yet
return(None) return(None)
else: else:
snapshot=self.find_snapshot(target_dataset.our_snapshots[:-1].snapshot_name) snapshot=self.find_snapshot(target_dataset.our_snapshots[-1].snapshot_name)
if not snapshot: if not snapshot:
raise(Exception("Cant find latest target snapshot on source")) raise(Exception("Cant find latest target snapshot on source"))
@ -882,8 +882,8 @@ class ZfsDataset():
#now let thinner decide what we want on both sides #now let thinner decide what we want on both sides
self.verbose("Create thinning list") self.verbose("Create thinning list")
(source_keeps, source_obsoletes)=self.thin(keeps=[self.our_snapshots[:-1]]) (source_keeps, source_obsoletes)=self.thin(keeps=[self.our_snapshots[-1]])
(target_keeps, target_obsoletes)=target_dataset.thin(keeps=[target_dataset.our_snapshots[:-1]]) (target_keeps, target_obsoletes)=target_dataset.thin(keeps=[target_dataset.our_snapshots[-1]])
#stuff that is before common snapshot can be deleted rightaway #stuff that is before common snapshot can be deleted rightaway
if common_snapshot: if common_snapshot: