From e6ce90fdb16dcda6902ecf7857d96a86d6e3fbe5 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Thu, 26 Mar 2015 13:04:06 -0700 Subject: [PATCH] Make sure that ulimits are adjusted for ceph-objectstore-tool Fixes: #11204 Signed-off-by: David Zafman --- tasks/ceph_manager.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasks/ceph_manager.py b/tasks/ceph_manager.py index e58b2a674cc61..2b3595b42d295 100644 --- a/tasks/ceph_manager.py +++ b/tasks/ceph_manager.py @@ -192,14 +192,14 @@ class Thrasher: remotes.iterkeys() if ('keyvaluestore_backend' in self.ceph_manager.ctx.ceph.conf['osd']): - prefix = ("sudo ceph-objectstore-tool " + prefix = ("sudo adjust-ulimits ceph-objectstore-tool " "--data-path {fpath} --journal-path {jpath} " "--type keyvaluestore " "--log-file=" "/var/log/ceph/objectstore_tool.\\$pid.log ". format(fpath=FSPATH, jpath=JPATH)) else: - prefix = ("sudo ceph-objectstore-tool " + prefix = ("sudo adjust-ulimits ceph-objectstore-tool " "--data-path {fpath} --journal-path {jpath} " "--log-file=" "/var/log/ceph/objectstore_tool.\\$pid.log ". @@ -291,14 +291,14 @@ class Thrasher: JPATH = os.path.join(FSPATH, "journal") if ('keyvaluestore_backend' in self.ceph_manager.ctx.ceph.conf['osd']): - prefix = ("sudo ceph-objectstore-tool " + prefix = ("sudo adjust-ulimits ceph-objectstore-tool " "--data-path {fpath} --journal-path {jpath} " "--type keyvaluestore " "--log-file=" "/var/log/ceph/objectstore_tool.\\$pid.log ". format(fpath=FSPATH, jpath=JPATH)) else: - prefix = ("sudo ceph-objectstore-tool " + prefix = ("sudo adjust-ulimits ceph-objectstore-tool " "--data-path {fpath} --journal-path {jpath} " "--log-file=" "/var/log/ceph/objectstore_tool.\\$pid.log ". @@ -699,7 +699,7 @@ class ObjectStoreTool: def build_cmd(self, options, args, stdin): lines = [] if self.object_name: - lines.append("object=$(sudo ceph-objectstore-tool " + lines.append("object=$(sudo adjust-ulimits ceph-objectstore-tool " "{paths} --pgid {pgid} --op list |" "grep '\"oid\":\"{name}\"')". format(paths=self.paths, @@ -707,7 +707,7 @@ class ObjectStoreTool: name=self.object_name)) args = '"$object" ' + args options += " --pgid {pgid}".format(pgid=self.pgid) - cmd = ("sudo ceph-objectstore-tool {paths} {options} {args}". + cmd = ("sudo adjust-ulimits ceph-objectstore-tool {paths} {options} {args}". format(paths=self.paths, args=args, options=options)) -- 2.39.5