RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 18:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2020-01-19 15:32:25 -06:00
parent 0bdaf4b953
commit 0aee4e5f04
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qa/tasks/ceph_manager.py
View File

@ -286,7 +286,7 @@ class OSDThrasher(Thrasher):
with safe_while(sleep=15, tries=40, action="ceph-objectstore-tool --op list-pgs") as proceed: with safe_while(sleep=15, tries=40, action="ceph-objectstore-tool --op list-pgs") as proceed:
while proceed(): while proceed():
proc = self.run_ceph_objectstore_tool( proc = self.run_ceph_objectstore_tool(
exp_remote, 'osd.%s' % osd, exp_remote, 'osd.%s' % exp_osd,
prefix + [ prefix + [
'--data-path', FSPATH.format(id=exp_osd), '--data-path', FSPATH.format(id=exp_osd),
'--journal-path', JPATH.format(id=exp_osd), '--journal-path', JPATH.format(id=exp_osd),
@ -325,7 +325,7 @@ class OSDThrasher(Thrasher):
# export # export
# Can't use new export-remove op since this is part of upgrade testing # Can't use new export-remove op since this is part of upgrade testing
proc = self.run_ceph_objectstore_tool( proc = self.run_ceph_objectstore_tool(
exp_remote, 'osd.%s' % osd, exp_remote, 'osd.%s' % exp_osd,
prefix + [ prefix + [
'--data-path', FSPATH.format(id=exp_osd), '--data-path', FSPATH.format(id=exp_osd),
'--journal-path', JPATH.format(id=exp_osd), '--journal-path', JPATH.format(id=exp_osd),
@ -339,7 +339,7 @@ class OSDThrasher(Thrasher):
format(ret=proc.exitstatus)) format(ret=proc.exitstatus))
# remove # remove
proc = self.run_ceph_objectstore_tool( proc = self.run_ceph_objectstore_tool(
exp_remote, 'osd.%s' % osd, exp_remote, 'osd.%s' % exp_osd,
prefix + [ prefix + [
'--data-path', FSPATH.format(id=exp_osd), '--data-path', FSPATH.format(id=exp_osd),
'--journal-path', JPATH.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 # If pg isn't already on this osd, then we will move it there
proc = self.run_ceph_objectstore_tool( proc = self.run_ceph_objectstore_tool(
imp_remote, imp_remote,
'osd.%s' % osd, 'osd.%s' % imp_osd,
prefix + [ prefix + [
'--data-path', FSPATH.format(id=imp_osd), '--data-path', FSPATH.format(id=imp_osd),
'--journal-path', JPATH.format(id=imp_osd), '--journal-path', JPATH.format(id=imp_osd),