tasks/cephfs: use set_conf() from test case class

...because this is the one that will store up
changes to roll back during teardown.

Doing this makes it easy to run lots of test cases
togeher in a single teuthology run, raher than
setting up/tearing down the ceph cluster for each
on.

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/tasks/mds_auto_repair.py b/tasks/mds_auto_repair.py
index 3f0bd96bf3526c171723d4214f818cd0cf87f1be..586bf05238446050fa02a29ff8b7fb7bd8146b34 100644 (file)
--- a/tasks/mds_auto_repair.py
+++ b/tasks/mds_auto_repair.py
@@ -28,10 +28,10 @@ class TestMDSAutoRepair(CephFSTestCase):
         """
 
         # trim log segment as fast as possible
-        self.fs.set_ceph_conf('mds', 'mds cache size', 100)
-        self.fs.set_ceph_conf('mds', 'mds log max segments', 2)
-        self.fs.set_ceph_conf('mds', 'mds log events per segment', 1)
-        self.fs.set_ceph_conf('mds', 'mds verify backtrace', 1)
+        self.set_conf('mds', 'mds cache size', 100)
+        self.set_conf('mds', 'mds log max segments', 2)
+        self.set_conf('mds', 'mds log events per segment', 1)
+        self.set_conf('mds', 'mds verify backtrace', 1)
         self.fs.mds_restart()
         self.fs.wait_for_daemons()
 

diff --git a/tasks/mds_client_limits.py b/tasks/mds_client_limits.py
index a115b86e2833b57a2181bcaf0aded5db19d558b6..2bd12f1a29f87759e251a10b258d3b359230f6d1 100644 (file)
--- a/tasks/mds_client_limits.py
+++ b/tasks/mds_client_limits.py
@@ -62,7 +62,7 @@ class TestClientLimits(CephFSTestCase):
         cache_size = 200
         open_files = 250
 
-        self.fs.set_ceph_conf('mds', 'mds cache size', cache_size)
+        self.set_conf('mds', 'mds cache size', cache_size)
         self.fs.mds_restart()
         self.fs.wait_for_daemons()