From 88d856d813b533a16ad10f9cb68971b321262f3c Mon Sep 17 00:00:00 2001 From: Edwin Eefting Date: Thu, 27 Jan 2022 11:02:11 +0100 Subject: [PATCH] previous changes and this fix improved caching (less runs in test_scaling.py) --- tests/test_scaling.py | 6 ++++-- zfs_autobackup/ZfsNode.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/test_scaling.py b/tests/test_scaling.py index 0e54db6..028e3f9 100644 --- a/tests/test_scaling.py +++ b/tests/test_scaling.py @@ -78,7 +78,8 @@ class TestZfsScaling(unittest2.TestCase): #this triggers if you make a change with an impact of more than O(snapshot_count/2) - expected_runs=743 + expected_runs=636 + print("EXPECTED RUNS: {}".format(expected_runs)) print("ACTUAL RUNS: {}".format(run_counter)) self.assertLess(abs(run_counter-expected_runs), dataset_count/2) @@ -92,6 +93,7 @@ class TestZfsScaling(unittest2.TestCase): #this triggers if you make a change with a performance impact of more than O(snapshot_count/2) - expected_runs=947 + expected_runs=842 + print("EXPECTED RUNS: {}".format(expected_runs)) print("ACTUAL RUNS: {}".format(run_counter)) self.assertLess(abs(run_counter-expected_runs), dataset_count/2) diff --git a/zfs_autobackup/ZfsNode.py b/zfs_autobackup/ZfsNode.py index bdd367a..5bd9665 100644 --- a/zfs_autobackup/ZfsNode.py +++ b/zfs_autobackup/ZfsNode.py @@ -107,7 +107,7 @@ class ZfsNode(ExecuteNode): def get_dataset(self, name, force_exists=None): """get a ZfsDataset() object from name. stores objects internally to enable caching""" - return self.__datasets.setdefault(name, ZfsDataset(self, name)) + return self.__datasets.setdefault(name, ZfsDataset(self, name, force_exists)) def reset_progress(self): """reset progress output counters"""