From: Sage Weil <sage@redhat.com>
Date: Thu, 16 Jan 2020 22:01:05 +0000 (-0600)
Subject: qa/tasks/ceph_manager: fix filestore split command
X-Git-Tag: v15.1.0~189^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7fefcdb6d3d5c777d26971563af450971fa8a9fe;p=ceph.git

qa/tasks/ceph_manager: fix filestore split command

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py
index 524a63668fa5..2ceb72f1ddb8 100644
--- a/qa/tasks/ceph_manager.py
+++ b/qa/tasks/ceph_manager.py
@@ -394,10 +394,11 @@ class OSDThrasher(Thrasher):
             # apply low split settings to each pool
             if not self.ceph_manager.cephadm:
                 for pool in self.ceph_manager.list_pools():
-                    no_sudo_prefix = ' '.join(prefix[1:])
                     cmd = ("CEPH_ARGS='--filestore-merge-threshold 1 "
                            "--filestore-split-multiple 1' sudo -E "
-                           + no_sudo_prefix + "--op apply-layout-settings --pool " + pool).format(id=osd)
+                           + 'ceph-objectstore-tool '
+                           + ' '.join(prefix)
+                           + " --op apply-layout-settings --pool " + pool).format(id=osd)
                     proc = remote.run(args=cmd, wait=True, check_status=False, stderr=StringIO())
                     output = proc.stderr.getvalue()
                     if 'Couldn\'t find pool' in output: