From b51eefa1393f9810b145df29e56a3722ee172e95 Mon Sep 17 00:00:00 2001
From: Edwin Eefting <edwin@datux.nl>
Date: Wed, 1 Apr 2020 18:00:55 +0200
Subject: [PATCH] backup

---
 bin/zfs-autobackup | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/bin/zfs-autobackup b/bin/zfs-autobackup
index be6205c..a73baef 100755
--- a/bin/zfs-autobackup
+++ b/bin/zfs-autobackup
@@ -1397,6 +1397,9 @@ class ZfsNode(ExecuteNode):
 
            returns: list of ZfsDataset
         """
+
+        self.debug("Getting selected datasets")
+
         #get all source filesystems that have the backup property
         lines=self.run(tab_split=True, readonly=True, cmd=[
             "zfs", "get", "-t",  "volume,filesystem", "-o", "name,value,source", "-s", "local,inherited", "-H", "autobackup:"+self.backup_name
@@ -1432,24 +1435,30 @@ class ZfsNode(ExecuteNode):
         return(selected_filesystems)
 
 
-    def received_datasets(self, target_path):
-        """determine already received datasets for this backup
+    # def received_datasets(self, target_path):
+    #     """determine already received datasets for this backup
 
-           returns: list of ZfsDataset        
-        """
-        #get all source filesystems that have the backup property
-        lines=self.run(tab_split=True, readonly=True, cmd=[
-            "zfs", "get", "-t",  "volume,filesystem", "-o", "name,value,source", "-s", "local,inherited", "-H", "-r", "autobackup:"+self.backup_name, target_path
-        ])
+    #        returns: list of ZfsDataset        
+    #     """
 
-        #consider all datasets in target_path with the correct autobackup property, as a received dataset 
-        ret=[]
-        for line in lines:
-            (name,value,source)=line
-            dataset=ZfsDataset(self, name)
-            dataset.verbose("disse")
+    #     dataset=ZfsDataset(self, name)
 
-        return(ret)
+
+    #     #get all source filesystems that have the backup property
+
+    #     self.debug("Getting received datasets")
+    #     lines=self.run(tab_split=True, readonly=True, cmd=[
+    #         "zfs", "get", "-t",  "volume,filesystem", "-o", "name,value,source", "-s", "local,inherited", "-H", "-r", "autobackup:"+self.backup_name, target_path
+    #     ])
+
+    #     #consider all datasets in target_path with the correct autobackup property, as a received dataset 
+    #     ret=[]
+    #     for line in lines:
+    #         (name,value,source)=line
+    #         dataset=ZfsDataset(self, name)
+    #         dataset.verbose("disse")
+
+    #     return(ret)
 
 
 
@@ -1612,9 +1621,10 @@ class ZfsAutobackup:
 
 
             #thin/destroy obsolete datasets on target
-            for dataset in target_node.received_datasets(self.args.target_path):
+            for dataset in ZfsDataset(target_node, self.args.target_path).recursive_datasets:
                 if dataset not in source_datasets:
                     dataset.verbose("Obsolete")
+    
 
 
             #sync datasets