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

zfs-verify wip (not functional yet)

Browse Source
This commit is contained in:
Edwin Eefting 2022-01-19 00:11:27 +01:00
parent 787e3dba9c
commit 7b4f10080f
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zfs_autobackup/ZfsAutoverify.py
View File

@ -34,9 +34,9 @@ class ZfsAutoverify(ZfsAuto):
return (parser) return (parser)
def verify_filesystem(self, source_snapshot, source_mnt, target_snapshot, target_mnt):
def verify_filesystem(self, source_dataset, source_mnt, target_dataset, target_mnt): # XXX create proper rsync command that also support pull/push mode somehow.
pass pass
@ -59,8 +59,12 @@ class ZfsAutoverify(ZfsAuto):
target_name = self.make_target_name(source_dataset) target_name = self.make_target_name(source_dataset)
target_dataset = ZfsDataset(target_node, target_name) target_dataset = ZfsDataset(target_node, target_name)
# find common snapshots to operate on
source_snapshot = source_dataset.find_common_snapshot(target_dataset)
target_snapshot = target_dataset.find_snapshot(source_snapshot)
if source_dataset.properties['type']=="filesystem": if source_dataset.properties['type']=="filesystem":
self.verify_filesystem(source_dataset, source_mnt, target_dataset, target_mnt) self.verify_filesystem(source_snapshot, source_mnt, target_snapshot, target_mnt)
elif source_dataset.properties['type']=="volume": elif source_dataset.properties['type']=="volume":
self.verify_volume(source_dataset, target_dataset) self.verify_volume(source_dataset, target_dataset)
else: else:
@ -76,16 +80,18 @@ class ZfsAutoverify(ZfsAuto):
def create_mountpoints(self, source_node, target_node): def create_mountpoints(self, source_node, target_node):
# prepare mount points # prepare mount points
source_node.debug("Create temporary mount point")
source_mnt = "/tmp/zfs-autoverify_source_{}_{}".format(platform.node(), os.getpid()) source_mnt = "/tmp/zfs-autoverify_source_{}_{}".format(platform.node(), os.getpid())
source_node.run(["mkdir", source_mnt]) source_node.run(["mkdir", source_mnt])
target_node.debug("Create temporary mount point")
target_mnt = "/tmp/zfs-autoverify_target_{}_{}".format(platform.node(), os.getpid()) target_mnt = "/tmp/zfs-autoverify_target_{}_{}".format(platform.node(), os.getpid())
target_node.run(["mkdir", target_mnt]) target_node.run(["mkdir", target_mnt])
return source_mnt, target_mnt return source_mnt, target_mnt
def cleanup_mountpoint(self, node, mnt): def cleanup_mountpoint(self, node, mnt):
node.debug("Cleaning up temporary mount point")
node.run([ "umount", mnt ], hide_errors=True, valid_exitcodes=[] ) node.run([ "umount", mnt ], hide_errors=True, valid_exitcodes=[] )
node.run([ "rmdir", mnt ], hide_errors=True, valid_exitcodes=[] ) node.run([ "rmdir", mnt ], hide_errors=True, valid_exitcodes=[] )

4
zfs_autobackup/ZfsDataset.py
View File

@ -778,10 +778,6 @@ class ZfsDataset:
# target has nothing yet # target has nothing yet
return None return None
else: else:
# snapshot=self.find_snapshot(target_dataset.snapshots[-1].snapshot_name)
# if not snapshot:
# try to common snapshot
for source_snapshot in reversed(self.snapshots): for source_snapshot in reversed(self.snapshots):
if target_dataset.find_snapshot(source_snapshot): if target_dataset.find_snapshot(source_snapshot):
source_snapshot.debug("common snapshot") source_snapshot.debug("common snapshot")