zfs-check basic version complete

zfs_autobackup/ZfsCheck.py

@@ -4,6 +4,7 @@ from .ZfsNode import ZfsNode
 from .util import *
 from .CliBase import CliBase
 
+
 class ZfsCheck(CliBase):
 
     def __init__(self, argv, print_arguments=True):
@@ -11,31 +12,34 @@ class ZfsCheck(CliBase):
         # NOTE: common options and parameters are in ZfsAuto
         super(ZfsCheck, self).__init__(argv, print_arguments)
 
-        self.node=ZfsNode(self.log, readonly=self.args.test, debug_output=self.args.debug_output)
+        self.node = ZfsNode(self.log, readonly=self.args.test, debug_output=self.args.debug_output)
-
 
     def get_parser(self):
 
-        parser=super(ZfsCheck, self).get_parser()
+        parser = super(ZfsCheck, self).get_parser()
 
-        #positional arguments
+        # positional arguments
-        parser.add_argument('snapshot', metavar='SNAPSHOT', default=None, nargs='?',
+        parser.add_argument('snapshot', metavar='SNAPSHOT', default=None, nargs='?', help='Snapshot to checksum')
-                            help='Snapshot to checksum')
 
+        group = parser.add_argument_group('Hasher options')
 
-        group=parser.add_argument_group('Hasher options')
+        group.add_argument('--block-size', metavar="BYTES", default=4096, help="Read block-size, default %(default)s",
-
+                           type=int)
-        group.add_argument('--block-size', metavar="BYTES", default=4096, help="Read block-size, default %(default)s", type=int)
+        group.add_argument('--count', metavar="COUNT", default=int((100 * (1024 ** 2)) / 4096),
-        group.add_argument('--count', metavar="COUNT", default=int((100*(1024**2))/4096), help="Generate a hash for every COUNT blocks. default %(default)s", type=int) #100MiB
+                           help="Generate a hash for every COUNT blocks. default %(default)s", type=int)  # 100MiB
 
         return parser
 
     def parse_args(self, argv):
-        args=super(ZfsCheck, self).parse_args(argv)
+        args = super(ZfsCheck, self).parse_args(argv)
 
         if args.test:
             self.warning("TEST MODE - NOT DOING ANYTHING USEFULL")
-            self.log.show_debug=True #show at least what we would do
+            self.log.show_debug = True  # show at least what we would do
+
+        if args.snapshot is None:
+            self.error("Please specify SNAPSHOT")
+            sys.exit(1)
 
         return args
 
@@ -44,7 +48,7 @@ class ZfsCheck(CliBase):
 
         :type snapshot: ZfsDataset.ZfsDataset
         """
-        mnt="/tmp/"+tmp_name()
+        mnt = "/tmp/" + tmp_name()
 
         try:
             self.debug("Create temporary mount point {}".format(mnt))
@@ -62,36 +66,85 @@ class ZfsCheck(CliBase):
             self.debug("Cleaning up temporary mount point")
             self.node.run(["rmdir", mnt], hide_errors=True, valid_exitcodes=[])
 
-    # def hash_volume(self, snapshot):
+    # NOTE: https://www.google.com/search?q=Mount+Path+Limit+freebsd
+    # Freebsd has limitations regarding path length, so we have to clone it so the part stays sort
+    def activate_volume_snapshot(self, snapshot):
+        """clone volume, waits and tries to findout /dev path to the volume, in a compatible way. (linux/freebsd/smartos)"""
 
+        clone_name = get_tmp_clone_name(snapshot)
+        clone = snapshot.clone(clone_name)
+
+        # TODO: add smartos location to this list as well
+        locations = [
+            "/dev/zvol/" + clone_name
+        ]
+
+        clone.debug("Waiting for /dev entry to appear in: {}".format(locations))
+        time.sleep(0.1)
+
+        start_time = time.time()
+        while time.time() - start_time < 10:
+            for location in locations:
+                if pathlib.Path(location).is_block_device():
+                    return location
+
+                # fake it in testmode
+                if self.args.test:
+                    return location
+
+            time.sleep(1)
+
+        raise (Exception("Timeout while waiting for /dev entry to appear. (looking in: {})".format(locations)))
+
+    def deacitvate_volume_snapshot(self, snapshot):
+        """destroys temporary volume snapshot"""
+        clone_name = get_tmp_clone_name(snapshot)
+        clone = snapshot.zfs_node.get_dataset(clone_name)
+        clone.destroy(deferred=True, verbose=False)
+
+    def hash_volume(self, snapshot, count, bs):
+        try:
+            dev=self.activate_volume_snapshot(snapshot)
+
+            self.debug("Hashing dev: {}".format(dev))
+            if not self.args.test:
+                for (block, hash) in block_hash(dev, count, bs):
+                    print("{}\t{}".format(block, hash))
+
+
+        finally:
+
+            self.deacitvate_volume_snapshot(snapshot)
 
     def run(self):
 
-        snapshot=self.node.get_dataset(self.args.snapshot)
+        snapshot = self.node.get_dataset(self.args.snapshot)
 
         if not snapshot.exists:
-            snapshot.error("Dataset not found")
+            snapshot.error("Snapshot not found")
             sys.exit(1)
 
         if not snapshot.is_snapshot:
             snapshot.error("Dataset should be a snapshot")
             sys.exit(1)
 
-        dataset_type=snapshot.parent.properties['type']
+        dataset_type = snapshot.parent.properties['type']
 
-        if dataset_type=='volume':
+        snapshot.verbose("Generating checksums...")
-            self.checksum_volume(snapshot, self.args.count, self.args.block_size)
+
-        elif dataset_type=='filesystem':
+        if dataset_type == 'volume':
+            self.hash_volume(snapshot, self.args.count, self.args.block_size)
+        elif dataset_type == 'filesystem':
             self.hash_filesystem(snapshot, self.args.count, self.args.block_size)
         else:
             raise Exception("huh?")
 
-        pass
 
 def cli():
     import sys
 
     sys.exit(ZfsCheck(sys.argv[1:], False).run())
 
+
 if __name__ == "__main__":
     cli()

zfs_autobackup/util.py

@@ -77,35 +77,4 @@ def get_tmp_clone_name(snapshot):
     return pool.name+"/"+tmp_name()
 
 
-#NOTE: https://www.google.com/search?q=Mount+Path+Limit+freebsd
-#Freebsd has limitations regarding path length, so we have to clone it so the part stays sort
-def activate_volume_snapshot(snapshot):
-    """clone volume, waits and tries to findout /dev path to the volume, in a compatible way. (linux/freebsd/smartos)"""
-
-    clone_name= get_tmp_clone_name(snapshot)
-    clone=snapshot.clone(clone_name)
-
-    #NOTE: add smartos location to this list as well
-    locations=[
-        "/dev/zvol/" + clone_name
-    ]
-
-    clone.debug("Waiting for /dev entry to appear...")
-    time.sleep(0.1)
-
-    start_time=time.time()
-    while time.time()-start_time<10:
-        for location in locations:
-            stdout, stderr, exit_code=clone.zfs_node.run(["test", "-e", location], return_all=True, valid_exitcodes=[0,1])
-
-            #fake it in testmode
-            if clone.zfs_node.readonly:
-                return location
-
-            if exit_code==0:
-                return location
-        time.sleep(1)
-
-    raise(Exception("Timeout while waiting for {} entry to appear.".format(locations)))
-