timeshifter/zfs-backup
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chg: sender -> stream

Browse Source
This commit is contained in:
timeshifter
2021-12-02 14:12:15 +01:00
parent cc2613771c
commit 9d89463219
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zfs-backup.py
+5 -4
View File
@@ -77,8 +77,8 @@ class Manager:
local_dataset, remote_dataset local_dataset, remote_dataset
) )
end_snapshot = self._get_last_snapshot_with_backup_tag(local_dataset) end_snapshot = self._get_last_snapshot_with_backup_tag(local_dataset)
sender = ZFS.send_incremental(start_snapshot, end_snapshot) stream = ZFS.send_incremental(start_snapshot, end_snapshot)
ZFS.receive(sender, self._external_pool.name) ZFS.receive(stream, self._external_pool.name)
def _get_last_snapshot_with_backup_tag(self, local_dataset): def _get_last_snapshot_with_backup_tag(self, local_dataset):
snapshots = self._find_snapshots_with_backup_tag(local_dataset) snapshots = self._find_snapshots_with_backup_tag(local_dataset)
@@ -262,13 +262,14 @@ class ZFS:
return sender return sender
@staticmethod @staticmethod
def receive(sender: Popen[str], pool_name): # TODO pool_name --> pool: Pool
def receive(stream: Popen[str], pool_name):
# -d Discard the first element of the sent snapshot's file system name # -d Discard the first element of the sent snapshot's file system name
# -F Force a rollback of the file system to the most recent snapshot before performing the receive operation. # -F Force a rollback of the file system to the most recent snapshot before performing the receive operation.
# -u File system that is associated with the received stream is not mounted. # -u File system that is associated with the received stream is not mounted.
check_output( check_output(
[config.ZFS, "receive", "-d", "-F", "-u", pool_name], [config.ZFS, "receive", "-d", "-F", "-u", pool_name],
stdin=sender.stdout, stdin=stream.stdout,
) )
@staticmethod @staticmethod