From: Douglas Fuller <dfuller@redhat.com>
Date: Mon, 15 May 2017 18:57:11 +0000 (-0400)
Subject: qa/cephfs: Fix for test_data_scan
X-Git-Tag: v12.0.3~1^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7f659e104d67ff0a63167041a41846b01363d2d6;p=ceph.git

qa/cephfs: Fix for test_data_scan

Don't assume that test_data_scan will be run on exactly 2 MDS nodes.

Fixes: http://tracker.ceph.com/issues/19893
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
---

diff --git a/qa/tasks/cephfs/test_data_scan.py b/qa/tasks/cephfs/test_data_scan.py
index 9b92216b9840..c30f5fa53efc 100644
--- a/qa/tasks/cephfs/test_data_scan.py
+++ b/qa/tasks/cephfs/test_data_scan.py
@@ -425,20 +425,11 @@ class TestDataScan(CephFSTestCase):
         self.fs.wait_for_daemons()
         if other_pool:
             for mds_id in self.fs.mds_ids:
-                self.wait_until_equal(
-                        lambda: get_state(mds_id),
-                        "up:active",
-                        timeout=60)
-            self.fs.mon_manager.raw_cluster_cmd('tell', 'mds.a',
-                                                'injectargs', '--debug-mds=20')
-            self.fs.mon_manager.raw_cluster_cmd('tell', 'mds.b',
-                                                'injectargs', '--debug-mds=20')
-            self.fs.mon_manager.raw_cluster_cmd('daemon', 'mds.a',
-                                                'scrub_path', '/',
-                                                'recursive', 'repair')
-            self.fs.mon_manager.raw_cluster_cmd('daemon', 'mds.b',
-                                                'scrub_path', '/',
-                                                'recursive', 'repair')
+                self.fs.mon_manager.raw_cluster_cmd('tell', "mds." + mds_id,
+                                                    'injectargs', '--debug-mds=20')
+                self.fs.mon_manager.raw_cluster_cmd('daemon', "mds." + mds_id,
+                                                    'scrub_path', '/',
+                                                    'recursive', 'repair')
         log.info(str(self.mds_cluster.status()))
 
         # Mount a client