suites: remove extra filestore_debug.. config that left

Extra un needed checks and sets for filestore in suites setup need to
be removed.

Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>

diff --git a/qa/suites/rados/singleton/all/random-eio.yaml b/qa/suites/rados/singleton/all/random-eio.yaml
index 258ae90edbf813914e6221099cb07755de89b14b..3f238e631e0615ade10e862679421c2cade05721 100644 (file)
--- a/qa/suites/rados/singleton/all/random-eio.yaml
+++ b/qa/suites/rados/singleton/all/random-eio.yaml
@@ -28,7 +28,6 @@ tasks:
 - full_sequential:
   - exec:
       client.0:
-        - sudo ceph tell osd.1 injectargs -- --filestore_debug_random_read_err=0.33
         - sudo ceph tell osd.1 injectargs -- --bluestore_debug_random_read_err=0.33
         - sudo ceph osd pool create test 16 16
         - sudo ceph osd pool set test size 3
@@ -42,5 +41,4 @@ tasks:
       create_pool: false
   - exec:
       client.0:
-        - sudo ceph tell osd.1 injectargs -- --filestore_debug_random_read_err=0.0
         - sudo ceph tell osd.1 injectargs -- --bluestore_debug_random_read_err=0.0

diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py
index 4690896b768205c649a286ee9eee425ba42a49b7..e35040b056f2aa71b7ee94dd45715c36120453d1 100644 (file)
--- a/qa/tasks/ceph_manager.py
+++ b/qa/tasks/ceph_manager.py
@@ -564,8 +564,6 @@ class OSDThrasher(Thrasher):
         self.dead_osds.remove(osd)
         self.live_osds.append(osd)
         if self.random_eio > 0 and osd == self.rerrosd:
-            self.ceph_manager.set_config(self.rerrosd,
-                                         filestore_debug_random_read_err = self.random_eio)
             self.ceph_manager.set_config(self.rerrosd,
                                          bluestore_debug_random_read_err = self.random_eio)
 
@@ -1406,9 +1404,6 @@ class OSDThrasher(Thrasher):
         delay = self.config.get("op_delay", 5)
         self.rerrosd = self.live_osds[0]
         if self.random_eio > 0:
-            self.ceph_manager.inject_args('osd', self.rerrosd,
-                                          'filestore_debug_random_read_err',
-                                          self.random_eio)
             self.ceph_manager.inject_args('osd', self.rerrosd,
                                           'bluestore_debug_random_read_err',
                                           self.random_eio)
@@ -1442,8 +1437,6 @@ class OSDThrasher(Thrasher):
             time.sleep(delay)
         self.all_up()
         if self.random_eio > 0:
-            self.ceph_manager.inject_args('osd', self.rerrosd,
-                                          'filestore_debug_random_read_err', '0.0')
             self.ceph_manager.inject_args('osd', self.rerrosd,
                                           'bluestore_debug_random_read_err', '0.0')
         for pool in list(self.pools_to_fix_pgp_num):

diff --git a/src/common/options/global.yaml.in b/src/common/options/global.yaml.in
index 882fbd4379a659fbded0452276fd8db0bea10bd4..9d4e1d251b208bddec2453d67724442ae5f501b2 100644 (file)
--- a/src/common/options/global.yaml.in
+++ b/src/common/options/global.yaml.in
@@ -5694,12 +5694,6 @@ options:
   level: dev
   default: false
   with_legacy: true
-- name: filestore_debug_random_read_err
-  type: float
-  level: dev
-  default: 0
-  with_legacy: true
-# Expensive debugging check on sync
 - name: filestore_debug_omap_check
   type: bool
   level: dev