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-21 01:42:15 +02:00
parent f5c8e558a3
commit 96741ac843
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zfs_autobackup
View File

@ -530,16 +530,19 @@ class ZfsDataset():
#initial or resume #initial or resume
if not prev_snapshot or resume_token: if not prev_snapshot or resume_token:
if resume_token: if resume_token:
target_dataset.verbose("(resumed)") #we dont know which one target_dataset.verbose("receiving resumed") #we dont know which one XXX: fix, we need to know for testmode
else: else:
target_dataset.verbose("receiving @{}".format(self.snapshot_name)) target_dataset.verbose("receiving @{}".format(self.snapshot_name))
pipe=self.send_pipe(resume=resume, resume_token=resume_token, show_progress=show_progress) pipe=self.send_pipe(resume=resume, resume_token=resume_token, show_progress=show_progress)
target_dataset.recv_pipe(pipe)
else: else:
#incemental #incemental
target_dataset.verbose("receiving @{}...@{}".format(prev_snapshot.snapshot_name, self.snapshot_name)) target_dataset.verbose("receiving @{}...@{}".format(prev_snapshot.snapshot_name, self.snapshot_name))
pipe=self.send_pipe(resume=resume, show_progress=show_progress, prev_snapshot=prev_snapshot)
#do it
target_dataset.recv_pipe(pipe)
if resume_token: if resume_token:
@ -558,7 +561,7 @@ class ZfsDataset():
# inital transfer # inital transfer
if not target_dataset.exists: if not target_dataset.exists:
self.debug("Initial transfer") self.debug("Initial transfer")
self.our_snapshots[0].transfer_snapshot(target_dataset) self.our_snapshots[0].transfer_snapshot(target_dataset, show_progress=True)
else: else:
#on resuming we dont need to know anything, the token is enough #on resuming we dont need to know anything, the token is enough
if 'receive_resume_token' in target_dataset.properties: if 'receive_resume_token' in target_dataset.properties:
@ -575,7 +578,7 @@ class ZfsDataset():
else: else:
if latest_common_snapshot: if latest_common_snapshot:
#transfer it #transfer it
source_snapshot.transfer_snapshot(target_dataset, latest_common_snapshot) source_snapshot.transfer_snapshot(target_dataset, latest_common_snapshot, show_progress=True)
latest_common_snapshot=source_snapshot latest_common_snapshot=source_snapshot
if not latest_common_snapshot: if not latest_common_snapshot: