Make sure that ulimits are adjusted for ceph-objectstore-tool

Fixes: #11204
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit e6ce90fdb16dcda6902ecf7857d96a86d6e3fbe5)

diff --git a/tasks/ceph_manager.py b/tasks/ceph_manager.py
index 815597242e52f49d2970c1a33fdc6c2fd490bba6..8cde514167e6d67c23b0fbb7a3e8e40818426a46 100644 (file)
--- a/tasks/ceph_manager.py
+++ b/tasks/ceph_manager.py
@@ -190,14 +190,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 ".
@@ -292,14 +292,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 ".
@@ -689,7 +689,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,
@@ -697,7 +697,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))