From: Sage Weil <sage@redhat.com>
Date: Sun, 19 Jan 2020 21:32:25 +0000 (-0600)
Subject: qa/tasks/ceph_manager: fix shell osd for ceph-objectstore-tool commands
X-Git-Tag: v15.1.0~144^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0aee4e5f0443f48f1e054c9af194f7d1a208d881;p=ceph.git

qa/tasks/ceph_manager: fix shell osd for ceph-objectstore-tool commands

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

diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py
index f83b5d58a796..2f9b747939a3 100644
--- a/qa/tasks/ceph_manager.py
+++ b/qa/tasks/ceph_manager.py
@@ -286,7 +286,7 @@ class OSDThrasher(Thrasher):
             with safe_while(sleep=15, tries=40, action="ceph-objectstore-tool --op list-pgs") as proceed:
                 while proceed():
                     proc = self.run_ceph_objectstore_tool(
-                        exp_remote, 'osd.%s' % osd,
+                        exp_remote, 'osd.%s' % exp_osd,
                         prefix + [
                             '--data-path', FSPATH.format(id=exp_osd),
                             '--journal-path', JPATH.format(id=exp_osd),
@@ -325,7 +325,7 @@ class OSDThrasher(Thrasher):
             # export
             # Can't use new export-remove op since this is part of upgrade testing
             proc = self.run_ceph_objectstore_tool(
-                exp_remote, 'osd.%s' % osd,
+                exp_remote, 'osd.%s' % exp_osd,
                 prefix + [
                     '--data-path', FSPATH.format(id=exp_osd),
                     '--journal-path', JPATH.format(id=exp_osd),
@@ -339,7 +339,7 @@ class OSDThrasher(Thrasher):
                                 format(ret=proc.exitstatus))
             # remove
             proc = self.run_ceph_objectstore_tool(
-                exp_remote, 'osd.%s' % osd,
+                exp_remote, 'osd.%s' % exp_osd,
                 prefix + [
                     '--data-path', FSPATH.format(id=exp_osd),
                     '--journal-path', JPATH.format(id=exp_osd),
@@ -356,7 +356,7 @@ class OSDThrasher(Thrasher):
                 # If pg isn't already on this osd, then we will move it there
                 proc = self.run_ceph_objectstore_tool(
                     imp_remote,
-                    'osd.%s' % osd,
+                    'osd.%s' % imp_osd,
                     prefix + [
                         '--data-path', FSPATH.format(id=imp_osd),
                         '--journal-path', JPATH.format(id=imp_osd),