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

Cleaned whitespace

Browse Source
This commit is contained in:
Marius van Witzenburg 2020-03-08 22:05:48 +01:00
parent 1d9c25d3b4
commit e8b90abfde
No known key found for this signature in database
GPG Key ID: 554DA2C4D1D47FC5
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/zfs-autobackup
View File

@ -581,7 +581,7 @@ class ZfsDataset():
def find_prev_snapshot(self, snapshot, other_snapshots=False): def find_prev_snapshot(self, snapshot, other_snapshots=False):
"""find previous snapshot in this dataset. None if it doesnt exist. """find previous snapshot in this dataset. None if it doesnt exist.
other_snapshots: set to true to also return snapshots that where not created by us. (is_ours) other_snapshots: set to true to also return snapshots that where not created by us. (is_ours)
""" """
@ -1019,7 +1019,7 @@ class ZfsDataset():
# snapshot=self.find_snapshot(target_dataset.snapshots[-1].snapshot_name) # snapshot=self.find_snapshot(target_dataset.snapshots[-1].snapshot_name)
# if not snapshot: # if not snapshot:
#try to common snapshot #try to common snapshot
for target_snapshot in reversed(target_dataset.snapshots): for target_snapshot in reversed(target_dataset.snapshots):
if self.find_snapshot(target_snapshot): if self.find_snapshot(target_snapshot):
target_snapshot.debug("common snapshot") target_snapshot.debug("common snapshot")
@ -1084,7 +1084,7 @@ class ZfsDataset():
target_dataset.debug("Creating virtual target snapshots") target_dataset.debug("Creating virtual target snapshots")
source_snapshot=start_snapshot source_snapshot=start_snapshot
while source_snapshot: while source_snapshot:
#create virtual target snapshot #create virtual target snapshot
virtual_snapshot=ZfsDataset(target_dataset.zfs_node, target_dataset.filesystem_name+"@"+source_snapshot.snapshot_name,force_exists=False) virtual_snapshot=ZfsDataset(target_dataset.zfs_node, target_dataset.filesystem_name+"@"+source_snapshot.snapshot_name,force_exists=False)
target_dataset.snapshots.append(virtual_snapshot) target_dataset.snapshots.append(virtual_snapshot)
source_snapshot=self.find_next_snapshot(source_snapshot, other_snapshots) source_snapshot=self.find_next_snapshot(source_snapshot, other_snapshots)
@ -1113,7 +1113,7 @@ class ZfsDataset():
#now send/destroy the rest off the source #now send/destroy the rest off the source
prev_source_snapshot=common_snapshot prev_source_snapshot=common_snapshot
prev_target_snapshot=target_dataset.find_snapshot(common_snapshot) prev_target_snapshot=target_dataset.find_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) #virtual target_snapshot=target_dataset.find_snapshot(source_snapshot) #virtual
@ -1148,7 +1148,7 @@ class ZfsDataset():
if resume_token: if resume_token:
target_dataset.debug("aborting resume, since we dont want that snapshot anymore") target_dataset.debug("aborting resume, since we dont want that snapshot anymore")
target_dataset.abort_resume() target_dataset.abort_resume()
resume_token=None resume_token=None
#destroy it if we also dont want it anymore: #destroy it if we also dont want it anymore:
if source_snapshot in source_obsoletes: if source_snapshot in source_obsoletes:
@ -1206,7 +1206,7 @@ class ZfsNode(ExecuteNode):
line.find("resume token contents")==0 or line.find("resume token contents")==0 or
len(progress_fields)!=1 or len(progress_fields)!=1 or
line.find("skipping ")==0): line.find("skipping ")==0):
#always output for debugging offcourse #always output for debugging offcourse
self.debug("STDERR|> "+line.rstrip()) self.debug("STDERR|> "+line.rstrip())
@ -1270,7 +1270,7 @@ class ZfsNode(ExecuteNode):
continue continue
snapshot=ZfsDataset(dataset.zfs_node, dataset.name+"@"+snapshot_name) snapshot=ZfsDataset(dataset.zfs_node, dataset.name+"@"+snapshot_name)
pool=dataset.split_path()[0] pool=dataset.split_path()[0]
if not pool in pools: if not pool in pools:
pools[pool]=[] pools[pool]=[]
@ -1516,5 +1516,3 @@ class ZfsAutobackup:
if __name__ == "__main__": if __name__ == "__main__":
zfs_autobackup=ZfsAutobackup() zfs_autobackup=ZfsAutobackup()
sys.exit(zfs_autobackup.run()) sys.exit(zfs_autobackup.run())