From 7f659e104d67ff0a63167041a41846b01363d2d6 Mon Sep 17 00:00:00 2001 From: Douglas Fuller Date: Mon, 15 May 2017 14:57:11 -0400 Subject: [PATCH] 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 --- qa/tasks/cephfs/test_data_scan.py | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/qa/tasks/cephfs/test_data_scan.py b/qa/tasks/cephfs/test_data_scan.py index 9b92216b98408..c30f5fa53efc6 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 -- 2.39.5