From 58e098324ec650aa4e1322cbf22b9c5f9673c784 Mon Sep 17 00:00:00 2001 From: Edwin Eefting Date: Wed, 27 May 2020 21:32:27 +0200 Subject: [PATCH] removed soon to be depricated -D option --- bin/zfs-autobackup | 3 ++- test_zfsnode.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/zfs-autobackup b/bin/zfs-autobackup index 7145706..67fec5d 100755 --- a/bin/zfs-autobackup +++ b/bin/zfs-autobackup @@ -931,6 +931,7 @@ class ZfsDataset(): cmd.append("-c") # use compressed WRITE records #NOTE: performance is usually worse with this option, according to manual + #also -D will be depricated in newer ZFS versions # if not resume: # if "-D" in self.zfs_node.supported_send_options: # cmd.append("-D") # dedupped stream, sends less duplicate data @@ -1351,7 +1352,7 @@ class ZfsNode(ExecuteNode): #not every zfs implementation supports them all ret=[] - for option in ["-L", "-e", "-c" , "-D" ]: + for option in ["-L", "-e", "-c" ]: if self.valid_command(["zfs","send", option, "zfs_autobackup_option_test"]): ret.append(option) return(ret) diff --git a/test_zfsnode.py b/test_zfsnode.py index 0268d0e..bd3b9b3 100644 --- a/test_zfsnode.py +++ b/test_zfsnode.py @@ -107,7 +107,7 @@ test_target1 description="[Source]" node=ZfsNode("test", logger, description=description) # -D propably always supported - self.assertIn("-D", node.supported_send_options) + self.assertGreater(len(node.supported_send_options),0) def test_supportedrecvoptions(self):