From ad27c29f0a98d4a17e21f3e172789f83edd39822 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 10 Jul 2018 13:14:05 -0700 Subject: [PATCH] qa: run asok command on correct machine The MDS may not be on the same machine where the cluster command is run. Fixes: http://tracker.ceph.com/issues/24858 Signed-off-by: Patrick Donnelly (cherry picked from commit fa25d6c8d1890bed2082b5c14f1c62a3db9ec27e) --- qa/tasks/cephfs/test_recovery_pool.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/qa/tasks/cephfs/test_recovery_pool.py b/qa/tasks/cephfs/test_recovery_pool.py index 097342a9d48bf..a8f240220bbc7 100644 --- a/qa/tasks/cephfs/test_recovery_pool.py +++ b/qa/tasks/cephfs/test_recovery_pool.py @@ -190,12 +190,11 @@ class TestRecoveryPool(CephFSTestCase): self.recovery_fs.mds_restart() self.fs.wait_for_daemons() self.recovery_fs.wait_for_daemons() - for mds_id in self.recovery_fs.mds_ids: - self.fs.mon_manager.raw_cluster_cmd('tell', "mds." + mds_id, + status = self.recovery_fs.status() + for rank in self.recovery_fs.get_ranks(status=status): + self.fs.mon_manager.raw_cluster_cmd('tell', "mds." + rank['name'], 'injectargs', '--debug-mds=20') - self.fs.mon_manager.raw_cluster_cmd('daemon', "mds." + mds_id, - 'scrub_path', '/', - 'recursive', 'repair') + self.fs.rank_asok(['scrub_path', '/', 'recursive', 'repair'], rank=rank['rank'], status=status) log.info(str(self.mds_cluster.status())) # Mount a client -- 2.39.5