enable-coredump -> adjust-ulimits

and set max_files to be big, too!

diff --git a/teuthology/misc.py b/teuthology/misc.py
index 11573b23c1855bee823ce97bd4884c474eda311c..cef9b7d7b8478056d70d03818bf371f19c6f40f8 100644 (file)
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -272,7 +272,7 @@ def create_simple_monmap(ctx, remote, conf):
 
     testdir = get_testdir(ctx)
     args = [
-        '{tdir}/enable-coredump'.format(tdir=testdir),
+        '{tdir}/adjust-ulimits'.format(tdir=testdir),
         'ceph-coverage',
         '{tdir}/archive/coverage'.format(tdir=testdir),
         'monmaptool',
@@ -637,7 +637,7 @@ def wait_until_healthy(ctx, remote):
     while True:
         r = remote.run(
             args=[
-                '{tdir}/enable-coredump'.format(tdir=testdir),
+                '{tdir}/adjust-ulimits'.format(tdir=testdir),
                 'ceph-coverage',
                 '{tdir}/archive/coverage'.format(tdir=testdir),
                 'ceph',
@@ -659,7 +659,7 @@ def wait_until_osds_up(ctx, cluster, remote):
     while True:
         r = remote.run(
             args=[
-                '{tdir}/enable-coredump'.format(tdir=testdir),
+                '{tdir}/adjust-ulimits'.format(tdir=testdir),
                 'ceph-coverage',
                 '{tdir}/archive/coverage'.format(tdir=testdir),
                 'ceph',
@@ -748,7 +748,7 @@ def write_secret_file(ctx, remote, role, keyring, filename):
     testdir = get_testdir(ctx)
     remote.run(
         args=[
-            '{tdir}/enable-coredump'.format(tdir=testdir),
+            '{tdir}/adjust-ulimits'.format(tdir=testdir),
             'ceph-coverage',
             '{tdir}/archive/coverage'.format(tdir=testdir),
             'ceph-authtool',

diff --git a/teuthology/task/adjust-ulimits b/teuthology/task/adjust-ulimits
new file mode 100755 (executable)
index 0000000..e49c2ba
--- /dev/null
+++ b/teuthology/task/adjust-ulimits
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+ulimit -c unlimited
+ulimit -n 4096
+exec "$@"

diff --git a/teuthology/task/admin_socket.py b/teuthology/task/admin_socket.py
index 3bb8296d9dc585639107d300d7e92e24ce577a68..53799f311db09436c0b42801e98f4c0d037c9aad 100644 (file)
--- a/teuthology/task/admin_socket.py
+++ b/teuthology/task/admin_socket.py
@@ -71,7 +71,7 @@ def _socket_command(ctx, remote, socket_path, command, args):
     remote.run(
         args=[
             'sudo',
-            '{tdir}/enable-coredump'.format(tdir=testdir),
+            '{tdir}/adjust-ulimits'.format(tdir=testdir),
             'ceph-coverage',
             '{tdir}/archive/coverage'.format(tdir=testdir),
             'ceph',

diff --git a/teuthology/task/ceph-fuse.py b/teuthology/task/ceph-fuse.py
index caa21fa42c5e70920fea76177ac8526bd5500a71..b0a0fe38bf38f1b5ea27a57a0364278de407ff18 100644 (file)
--- a/teuthology/task/ceph-fuse.py
+++ b/teuthology/task/ceph-fuse.py
@@ -82,7 +82,7 @@ def task(ctx, config):
 
         run_cmd=[
             'sudo',
-            '{tdir}/enable-coredump'.format(tdir=testdir),
+            '{tdir}/adjust-ulimits'.format(tdir=testdir),
             'ceph-coverage',
             '{tdir}/archive/coverage'.format(tdir=testdir),
             '{tdir}/daemon-helper'.format(tdir=testdir),

diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index f8c292d0e7f62a957f166b87a70eb96c4260eb8e..e8e7d7249f2f408c61d1e59ae04d8fef1d91b97c 100644 (file)
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -132,7 +132,7 @@ def ceph_log(ctx, config):
 @contextlib.contextmanager
 def ship_utilities(ctx, config):
     assert config is None
-    FILES = ['daemon-helper', 'enable-coredump', 'chdir-coredump',
+    FILES = ['daemon-helper', 'adjust-ulimits', 'chdir-coredump',
              'valgrind.supp', 'kcon_most']
     testdir = teuthology.get_testdir(ctx)
     for filename in FILES:
@@ -380,7 +380,7 @@ def cluster(ctx, config):
     ctx.cluster.only(firstmon).run(
         args=[
             'sudo',
-            '{tdir}/enable-coredump'.format(tdir=testdir),
+            '{tdir}/adjust-ulimits'.format(tdir=testdir),
             'ceph-coverage',
             coverage_dir,
             'ceph-authtool',
@@ -391,7 +391,7 @@ def cluster(ctx, config):
     ctx.cluster.only(firstmon).run(
         args=[
             'sudo',
-            '{tdir}/enable-coredump'.format(tdir=testdir),
+            '{tdir}/adjust-ulimits'.format(tdir=testdir),
             'ceph-coverage',
             coverage_dir,
             'ceph-authtool',
@@ -419,7 +419,7 @@ def cluster(ctx, config):
     ctx.cluster.only(firstmon).run(
         args=[
             'sudo',
-            '{tdir}/enable-coredump'.format(tdir=testdir),
+            '{tdir}/adjust-ulimits'.format(tdir=testdir),
             'ceph-coverage',
             coverage_dir,
             'ceph-authtool',
@@ -463,7 +463,7 @@ def cluster(ctx, config):
     run.wait(
         mons.run(
             args=[
-                '{tdir}/enable-coredump'.format(tdir=testdir),
+                '{tdir}/adjust-ulimits'.format(tdir=testdir),
                 'ceph-coverage',
                 coverage_dir,
                 'osdmaptool',
@@ -491,7 +491,7 @@ def cluster(ctx, config):
                     '-p',
                     '/var/lib/ceph/mds/ceph-{id}'.format(id=id_),
                     run.Raw('&&'),
-                    '{tdir}/enable-coredump'.format(tdir=testdir),
+                    '{tdir}/adjust-ulimits'.format(tdir=testdir),
                     'ceph-coverage',
                     coverage_dir,
                     'sudo',
@@ -595,7 +595,7 @@ def cluster(ctx, config):
             remote.run(
                 args=[
                     'MALLOC_CHECK_=3',
-                    '{tdir}/enable-coredump'.format(tdir=testdir),
+                    '{tdir}/adjust-ulimits'.format(tdir=testdir),
                     'ceph-coverage',
                     coverage_dir,
                     'sudo',
@@ -652,7 +652,7 @@ def cluster(ctx, config):
             mons.run(
                 args=[
                     'sudo',
-                    '{tdir}/enable-coredump'.format(tdir=testdir),
+                    '{tdir}/adjust-ulimits'.format(tdir=testdir),
                     'ceph-coverage',
                     coverage_dir,
                     'ceph-authtool',
@@ -679,7 +679,7 @@ def cluster(ctx, config):
                 )
             remote.run(
                 args=[
-                    '{tdir}/enable-coredump'.format(tdir=testdir),
+                    '{tdir}/adjust-ulimits'.format(tdir=testdir),
                     'ceph-coverage',
                     coverage_dir,
                     'sudo',
@@ -858,7 +858,7 @@ def run_daemon(ctx, config, type_):
                 num_active += 1
 
             run_cmd = [
-                '{tdir}/enable-coredump'.format(tdir=testdir),
+                '{tdir}/adjust-ulimits'.format(tdir=testdir),
                 'ceph-coverage',
                 coverage_dir,
                 'sudo',
@@ -896,7 +896,7 @@ def run_daemon(ctx, config, type_):
         (mon0_remote,) = ctx.cluster.only(firstmon).remotes.keys()
 
         mon0_remote.run(args=[
-            '{tdir}/enable-coredump'.format(tdir=testdir),
+            '{tdir}/adjust-ulimits'.format(tdir=testdir),
             'ceph-coverage',
             coverage_dir,
             'ceph',

diff --git a/teuthology/task/ceph_client.py b/teuthology/task/ceph_client.py
index 8d7d80c8f3979d5f5587057f4e7232824a9252e0..fd4f8cb2efdb510ecd95f3993e375fc88b8d15f5 100644 (file)
--- a/teuthology/task/ceph_client.py
+++ b/teuthology/task/ceph_client.py
@@ -15,7 +15,7 @@ def create_keyring(ctx):
             client_keyring = '/etc/ceph/ceph.client.{id}.keyring'.format(id=id_)
             remote.run(
                 args=[
-                    '{tdir}/enable-coredump'.format(tdir=testdir),
+                    '{tdir}/adjust-ulimits'.format(tdir=testdir),
                     'ceph-coverage',
                     coverage_dir,
                     'sudo',

diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py
index 86924848369e45cb056ebc17e3d90285dab3c670..bfa867b09a6c106a83f40c44ffde572e71ab26c0 100644 (file)
--- a/teuthology/task/ceph_manager.py
+++ b/teuthology/task/ceph_manager.py
@@ -276,7 +276,7 @@ class CephManager:
     def raw_cluster_cmd(self, *args):
         testdir = teuthology.get_testdir(self.ctx)
         ceph_args = [
-                '{tdir}/enable-coredump'.format(tdir=testdir),
+                '{tdir}/adjust-ulimits'.format(tdir=testdir),
                 'ceph-coverage',
                 '{tdir}/archive/coverage'.format(tdir=testdir),
                 'ceph',
@@ -291,7 +291,7 @@ class CephManager:
     def raw_cluster_cmd_result(self, *args):
         testdir = teuthology.get_testdir(self.ctx)
         ceph_args = [
-                '{tdir}/enable-coredump'.format(tdir=testdir),
+                '{tdir}/adjust-ulimits'.format(tdir=testdir),
                 'ceph-coverage',
                 '{tdir}/archive/coverage'.format(tdir=testdir),
                 'ceph',
@@ -306,7 +306,7 @@ class CephManager:
     def do_rados(self, remote, cmd):
         testdir = teuthology.get_testdir(self.ctx)
         pre = [
-            '{tdir}/enable-coredump'.format(tdir=testdir),
+            '{tdir}/adjust-ulimits'.format(tdir=testdir),
             'ceph-coverage',
             '{tdir}/archive/coverage'.format(tdir=testdir),
             'rados',
@@ -364,7 +364,7 @@ class CephManager:
         assert remote is not None
         args=[
             'sudo',
-            '{tdir}/enable-coredump'.format(tdir=testdir),
+            '{tdir}/adjust-ulimits'.format(tdir=testdir),
             'ceph-coverage',
             '{tdir}/archive/coverage'.format(tdir=testdir),
             'ceph',

diff --git a/teuthology/task/cram.py b/teuthology/task/cram.py
index 40c137fde37c13e08d9eba2d1e80d3b9c6d0829e..4829b8edd1b13af96b20d546b2c9cc999b05ce6a 100644 (file)
--- a/teuthology/task/cram.py
+++ b/teuthology/task/cram.py
@@ -113,7 +113,7 @@ def _run_tests(ctx, role):
             run.Raw('CEPH_REF={ref}'.format(ref=ceph_ref)),
             run.Raw('CEPH_ID="{id}"'.format(id=id_)),
             run.Raw('PYTHONPATH="$PYTHONPATH:{tdir}/binary/usr/local/lib/python2.7/dist-packages:{tdir}/binary/usr/local/lib/python2.6/dist-packages"'.format(tdir=testdir)),
-            '{tdir}/enable-coredump'.format(tdir=testdir),
+            '{tdir}/adjust-ulimits'.format(tdir=testdir),
             'ceph-coverage',
             '{tdir}/archive/coverage'.format(tdir=testdir),
             '{tdir}/virtualenv/bin/cram'.format(tdir=testdir),

diff --git a/teuthology/task/divergent_priors.py b/teuthology/task/divergent_priors.py
index db22ecda22ff64ac99d307c42b24819244d907dc..2c77a4956b715dff3dfd2613d305ad84a3fe2597 100644 (file)
--- a/teuthology/task/divergent_priors.py
+++ b/teuthology/task/divergent_priors.py
@@ -10,7 +10,7 @@ log = logging.getLogger(__name__)
 def rados(testdir, remote, cmd, wait=True):
     log.info("rados %s" % ' '.join(cmd))
     pre = [
-        '{tdir}/enable-coredump'.format(tdir=testdir),
+        '{tdir}/adjust-ulimits'.format(tdir=testdir),
         'ceph-coverage',
         '{tdir}/archive/coverage'.format(tdir=testdir),
         'rados',

diff --git a/teuthology/task/enable-coredump b/teuthology/task/enable-coredump
deleted file mode 100755 (executable)
index 4257764..0000000
--- a/teuthology/task/enable-coredump
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -e
-ulimit -c unlimited
-exec "$@"

diff --git a/teuthology/task/kclient.py b/teuthology/task/kclient.py
index 6cf0f5d86fe1fab4ccaa1c385e6e0b0f7dfc7179..6fec64618d52b0eb8cb4c3c65674ebfbe90a6868 100644 (file)
--- a/teuthology/task/kclient.py
+++ b/teuthology/task/kclient.py
@@ -69,7 +69,7 @@ def task(ctx, config):
         remote.run(
             args=[
                 'sudo',
-                '{tdir}/enable-coredump'.format(tdir=testdir),
+                '{tdir}/adjust-ulimits'.format(tdir=testdir),
                 'ceph-coverage',
                 '{tdir}/archive/coverage'.format(tdir=testdir),
                 '/sbin/mount.ceph',

diff --git a/teuthology/task/lockfile.py b/teuthology/task/lockfile.py
index ebb14de52c26a3309d929ed37ba5fa822ce2b4f9..748b9980684facdf1bbccef90f8548fb3a7bc0c1 100644 (file)
--- a/teuthology/task/lockfile.py
+++ b/teuthology/task/lockfile.py
@@ -192,7 +192,7 @@ def lock_one(op, ctx):
     try:
         proc = client_remote.run(
             args=[
-                '{tdir}/enable-coredump'.format(tdir=testdir),
+                '{tdir}/adjust-ulimits'.format(tdir=testdir),
                 'ceph-coverage',
                 '{tdir}/archive/coverage'.format(tdir=testdir),
                 '{tdir}/daemon-helper'.format(tdir=testdir),

diff --git a/teuthology/task/lost_unfound.py b/teuthology/task/lost_unfound.py
index 32c24baeb8e7f5f8171d9616cd1a0cb740e7a43d..c6dc47612ff74b29e79ff934d33822d3c229e3c2 100644 (file)
--- a/teuthology/task/lost_unfound.py
+++ b/teuthology/task/lost_unfound.py
@@ -10,7 +10,7 @@ def rados(ctx, remote, cmd):
     testdir = teuthology.get_testdir(ctx)
     log.info("rados %s" % ' '.join(cmd))
     pre = [
-        '{tdir}/enable-coredump'.format(tdir=testdir),
+        '{tdir}/adjust-ulimits'.format(tdir=testdir),
         'ceph-coverage',
         '{tdir}/archive/coverage'.format(tdir=testdir),
         'rados',

diff --git a/teuthology/task/object_source_down.py b/teuthology/task/object_source_down.py
index 7bd490d9574b7d408d0b50a649ab34cbf64453e1..eb0827c0e2514110147cb7f772c073ee6b3dd085 100644 (file)
--- a/teuthology/task/object_source_down.py
+++ b/teuthology/task/object_source_down.py
@@ -9,7 +9,7 @@ log = logging.getLogger(__name__)
 def rados(testdir, remote, cmd):
     log.info("rados %s" % ' '.join(cmd))
     pre = [
-        '{tdir}/enable-coredump'.format(tdir=testdir),
+        '{tdir}/adjust-ulimits'.format(tdir=testdir),
         'ceph-coverage',
         '{tdir}/archive/coverage'.format(tdir=testdir),
         'rados',

diff --git a/teuthology/task/omapbench.py b/teuthology/task/omapbench.py
index de8908185e29809b86d5d866a01fde74b7b03f2f..4b46a632dbc964af9decaef85459a882bcbcd4c7 100644 (file)
--- a/teuthology/task/omapbench.py
+++ b/teuthology/task/omapbench.py
@@ -53,7 +53,7 @@ def task(ctx, config):
         proc = remote.run(
             args=[
                 "/bin/sh", "-c",
-                " ".join(['{tdir}/enable-coredump',
+                " ".join(['{tdir}/adjust-ulimits',
                           'ceph-coverage',
                           '{tdir}/archive/coverage',
                           'omapbench',

diff --git a/teuthology/task/osd_backfill.py b/teuthology/task/osd_backfill.py
index e68a82f0617105bd174342eab748e083b6048051..28433026cea7911491ddce2653d1ba79305d774b 100644 (file)
--- a/teuthology/task/osd_backfill.py
+++ b/teuthology/task/osd_backfill.py
@@ -11,7 +11,7 @@ def rados_start(ctx, remote, cmd):
     log.info("rados %s" % ' '.join(cmd))
     testdir = teuthology.get_testdir(ctx)
     pre = [
-        '{tdir}/enable-coredump'.format(tdir=testdir),
+        '{tdir}/adjust-ulimits'.format(tdir=testdir),
         'ceph-coverage',
         '{tdir}/archive/coverage'.format(tdir=testdir),
         'rados',

diff --git a/teuthology/task/osd_failsafe_enospc.py b/teuthology/task/osd_failsafe_enospc.py
index ed32e5cf0233f79a74ec961e70fcdf9113b20be6..63a3230688b26fd0d6af6929e43f17b0aaec7b78 100644 (file)
--- a/teuthology/task/osd_failsafe_enospc.py
+++ b/teuthology/task/osd_failsafe_enospc.py
@@ -11,7 +11,7 @@ log = logging.getLogger(__name__)
 def rados(testdir, remote, cmd, wait=True):
     log.info("rados %s" % ' '.join(cmd))
     pre = [
-        '{tdir}/enable-coredump'.format(tdir=testdir),
+        '{tdir}/adjust-ulimits'.format(tdir=testdir),
         'ceph-coverage',
         '{tdir}/archive/coverage'.format(tdir=testdir),
         'rados',

diff --git a/teuthology/task/osd_recovery.py b/teuthology/task/osd_recovery.py
index 14bca228fc2778512d56b263d8d00363524db12a..d813a6782b34af1e9fde41f4a09e4b0a40cd9bd4 100644 (file)
--- a/teuthology/task/osd_recovery.py
+++ b/teuthology/task/osd_recovery.py
@@ -10,7 +10,7 @@ log = logging.getLogger(__name__)
 def rados_start(testdir, remote, cmd):
     log.info("rados %s" % ' '.join(cmd))
     pre = [
-        '{tdir}/enable-coredump'.format(tdir=testdir),
+        '{tdir}/adjust-ulimits'.format(tdir=testdir),
         'ceph-coverage',
         '{tdir}/archive/coverage'.format(tdir=testdir),
         'rados',

diff --git a/teuthology/task/peer.py b/teuthology/task/peer.py
index ce6d1d12a678e703dd70c0df1313658a4c6b5243..93a758f24c8f7b770074409e927fa6a75fe3f464 100644 (file)
--- a/teuthology/task/peer.py
+++ b/teuthology/task/peer.py
@@ -11,7 +11,7 @@ def rados(ctx, remote, cmd):
     testdir = teuthology.get_testdir(ctx)
     log.info("rados %s" % ' '.join(cmd))
     pre = [
-        '{tdir}/enable-coredump'.format(tdir=testdir),
+        '{tdir}/adjust-ulimits'.format(tdir=testdir),
         'ceph-coverage',
         '{tdir}/archive/coverage'.format(tdir=testdir),
         'rados',

diff --git a/teuthology/task/qemu.py b/teuthology/task/qemu.py
index 34811a77e8535ef19f1e35479ba381531a9f5f38..f69e851ae26c424d7ac7794a8164a413ff2fe1fc 100644 (file)
--- a/teuthology/task/qemu.py
+++ b/teuthology/task/qemu.py
@@ -162,7 +162,7 @@ def run_qemu(ctx, config):
 
         base_file = '{tdir}/qemu/base.{client}.qcow2'.format(tdir=testdir, client=client)
         args=[
-            '{tdir}/enable-coredump'.format(tdir=testdir),
+            '{tdir}/adjust-ulimits'.format(tdir=testdir),
             'ceph-coverage',
             '{tdir}/archive/coverage'.format(tdir=testdir),
             '{tdir}/daemon-helper'.format(tdir=testdir),

diff --git a/teuthology/task/rados.py b/teuthology/task/rados.py
index a6f96595737b09f002d4b4ccbd7ae05dd72acd1a..c2d97172c4a20c36ef8bcbbb3c7369a7b8acfa68 100644 (file)
--- a/teuthology/task/rados.py
+++ b/teuthology/task/rados.py
@@ -57,7 +57,7 @@ def task(ctx, config):
     op_weights = config.get('op_weights', {})
     testdir = teuthology.get_testdir(ctx)
     args = [
-        '{tdir}/enable-coredump'.format(tdir=testdir),
+        '{tdir}/adjust-ulimits'.format(tdir=testdir),
         'ceph-coverage',
         '{tdir}/archive/coverage'.format(tdir=testdir),
         'ceph_test_rados',

diff --git a/teuthology/task/radosbench.py b/teuthology/task/radosbench.py
index 54c64d828d62ef0389272df5129d94688aef07bb..420fa101f40ccd152f02f52d470175028048ec33 100644 (file)
--- a/teuthology/task/radosbench.py
+++ b/teuthology/task/radosbench.py
@@ -45,7 +45,7 @@ def task(ctx, config):
             proc = remote.run(
                 args=[
                     "/bin/sh", "-c",
-                    " ".join(['{tdir}/enable-coredump',
+                    " ".join(['{tdir}/adjust-ulimits',
                               'ceph-coverage',
                               '{tdir}/archive/coverage',
                               'rados',
@@ -62,7 +62,7 @@ def task(ctx, config):
         proc = remote.run(
             args=[
                 "/bin/sh", "-c",
-                " ".join(['{tdir}/enable-coredump',
+                " ".join(['{tdir}/adjust-ulimits',
                           'ceph-coverage',
                           '{tdir}/archive/coverage',
                           'rados',
@@ -87,7 +87,7 @@ def task(ctx, config):
             proc = remote.run(
                 args=[
                     "/bin/sh", "-c",
-                    " ".join(['{tdir}/enable-coredump',
+                    " ".join(['{tdir}/adjust-ulimits',
                               'ceph-coverage',
                               '{tdir}/archive/coverage',
                               'rados',

diff --git a/teuthology/task/radosgw-admin-rest.py b/teuthology/task/radosgw-admin-rest.py
index 8b17ebc11f4b7f5d7bf38b2a7e6a6822b3b33a00..4c57a00fe92ffea990c7a183d178e93844ac29f3 100644 (file)
--- a/teuthology/task/radosgw-admin-rest.py
+++ b/teuthology/task/radosgw-admin-rest.py
@@ -31,7 +31,7 @@ def rgwadmin(ctx, client, cmd):
     log.info('radosgw-admin: %s' % cmd)
     testdir = teuthology.get_testdir(ctx)
     pre = [
-        '{tdir}/enable-coredump'.format(tdir=testdir),
+        '{tdir}/adjust-ulimits'.format(tdir=testdir),
         'ceph-coverage',
         '{tdir}/archive/coverage'.format(tdir=testdir),
         'radosgw-admin',

diff --git a/teuthology/task/radosgw-admin.py b/teuthology/task/radosgw-admin.py
index f2a9f2e618115f668db997342825b1c881ef64fd..bdddd772ab1d8875effb5759ed7715e6c81d477c 100644 (file)
--- a/teuthology/task/radosgw-admin.py
+++ b/teuthology/task/radosgw-admin.py
@@ -29,7 +29,7 @@ def rgwadmin(ctx, client, cmd):
     log.info('radosgw-admin: %s' % cmd)
     testdir = teuthology.get_testdir(ctx)
     pre = [
-        '{tdir}/enable-coredump'.format(tdir=testdir),
+        '{tdir}/adjust-ulimits'.format(tdir=testdir),
         'ceph-coverage'.format(tdir=testdir),
         '{tdir}/archive/coverage'.format(tdir=testdir),
         'radosgw-admin'.format(tdir=testdir),

diff --git a/teuthology/task/rbd.py b/teuthology/task/rbd.py
index 3d4bc8c91f522e29e9cbb8c1a0fd905e7bf16463..d107c6f473b8dcd66e1386bb6e72d23d2f1a2bd5 100644 (file)
--- a/teuthology/task/rbd.py
+++ b/teuthology/task/rbd.py
@@ -54,7 +54,7 @@ def create_image(ctx, config):
         log.info('Creating image {name} with size {size}'.format(name=name,
                                                                  size=size))
         args = [
-                '{tdir}/enable-coredump'.format(tdir=testdir),
+                '{tdir}/adjust-ulimits'.format(tdir=testdir),
                 'ceph-coverage'.format(tdir=testdir),
                 '{tdir}/archive/coverage'.format(tdir=testdir),
                 'rbd',
@@ -79,7 +79,7 @@ def create_image(ctx, config):
             (remote,) = ctx.cluster.only(role).remotes.keys()
             remote.run(
                 args=[
-                    '{tdir}/enable-coredump'.format(tdir=testdir),
+                    '{tdir}/adjust-ulimits'.format(tdir=testdir),
                     'ceph-coverage',
                     '{tdir}/archive/coverage'.format(tdir=testdir),
                     'rbd',
@@ -166,7 +166,7 @@ def dev_create(ctx, config):
         remote.run(
             args=[
                 'sudo',
-                '{tdir}/enable-coredump'.format(tdir=testdir),
+                '{tdir}/adjust-ulimits'.format(tdir=testdir),
                 'ceph-coverage',
                 '{tdir}/archive/coverage'.format(tdir=testdir),
                 'rbd',
@@ -193,7 +193,7 @@ def dev_create(ctx, config):
                 args=[
                     'LD_LIBRARY_PATH={tdir}/binary/usr/local/lib'.format(tdir=testdir),
                     'sudo',
-                    '{tdir}/enable-coredump'.format(tdir=testdir),
+                    '{tdir}/adjust-ulimits'.format(tdir=testdir),
                     'ceph-coverage',
                     '{tdir}/archive/coverage'.format(tdir=testdir),
                     'rbd',
@@ -418,7 +418,7 @@ def run_xfstests_one_client(ctx, role, properties):
         # readlink -f <path> in order to get their canonical
         # pathname (so it matches what the kernel remembers).
         args = [
-            '{tdir}/enable-coredump'.format(tdir=testdir),
+            '{tdir}/adjust-ulimits'.format(tdir=testdir),
             'ceph-coverage',
             '{tdir}/archive/coverage'.format(tdir=testdir),
             '/usr/bin/sudo',

diff --git a/teuthology/task/rbd_fsx.py b/teuthology/task/rbd_fsx.py
index 16cb4f524b4be561eb9ecfdb4d3d3a102e91b58f..d841c2ecd3976cf642c77b2cfcfed638ccd83e2c 100644 (file)
--- a/teuthology/task/rbd_fsx.py
+++ b/teuthology/task/rbd_fsx.py
@@ -42,7 +42,7 @@ def _run_one_client(ctx, config, role):
     (remote,) = ctx.cluster.only(role).remotes.iterkeys()
     remote.run(
         args=[
-            '{tdir}/enable-coredump'.format(tdir=testdir),
+            '{tdir}/adjust-ulimits'.format(tdir=testdir),
             'ceph-coverage',
             '{tdir}/archive/coverage'.format(tdir=testdir),
             'ceph_test_librbd_fsx',

diff --git a/teuthology/task/recovery_bench.py b/teuthology/task/recovery_bench.py
index df1376970ea79ed28f765d75b489bd5cde63f2d8..9026716bc4967f0c6db45b990067cb358a910b6f 100644 (file)
--- a/teuthology/task/recovery_bench.py
+++ b/teuthology/task/recovery_bench.py
@@ -104,7 +104,7 @@ class RecoveryBencher:
         # create the objects
         osd_remote.run(
             args=[
-                '{tdir}/enable-coredump'.format(tdir=testdir),
+                '{tdir}/adjust-ulimits'.format(tdir=testdir),
                 'ceph-coverage',
                 '{tdir}/archive/coverage'.format(tdir=testdir),
                 'smalliobench'.format(tdir=testdir),
@@ -120,7 +120,7 @@ class RecoveryBencher:
         log.info('non-recovery (baseline)')
         p = osd_remote.run(
             args=[
-                '{tdir}/enable-coredump'.format(tdir=testdir),
+                '{tdir}/adjust-ulimits'.format(tdir=testdir),
                 'ceph-coverage',
                 '{tdir}/archive/coverage'.format(tdir=testdir),
                 'smalliobench',
@@ -142,7 +142,7 @@ class RecoveryBencher:
         log.info('recovery active')
         p = osd_remote.run(
             args=[
-                '{tdir}/enable-coredump'.format(tdir=testdir),
+                '{tdir}/adjust-ulimits'.format(tdir=testdir),
                 'ceph-coverage',
                 '{tdir}/archive/coverage'.format(tdir=testdir),
                 'smalliobench',

diff --git a/teuthology/task/restart.py b/teuthology/task/restart.py
index baacb223eb9223b1fc0c2311ffcc679571d7d0c2..c06b76d28cab674db11db885a71dc2fa881ba446 100644 (file)
--- a/teuthology/task/restart.py
+++ b/teuthology/task/restart.py
@@ -112,7 +112,7 @@ def task(ctx, config):
                         env_arg = '{var}={val}'.format(var=var, val=quoted_val)
                         args.append(run.Raw(env_arg))
                 args.extend([
-                            '{tdir}/enable-coredump'.format(tdir=testdir),
+                            '{tdir}/adjust-ulimits'.format(tdir=testdir),
                             'ceph-coverage',
                             '{tdir}/archive/coverage'.format(tdir=testdir),
                             '{srcdir}/{c}'.format(

diff --git a/teuthology/task/rgw.py b/teuthology/task/rgw.py
index e98e63502365e8dfdc61a92cb2fbef2d9aaf4720..9a48338b9f06292899711bd95bbe2da5442e82e0 100644 (file)
--- a/teuthology/task/rgw.py
+++ b/teuthology/task/rgw.py
@@ -110,7 +110,7 @@ def start_rgw(ctx, config):
  
         run_cmd=[
             'sudo',
-                '{tdir}/enable-coredump'.format(tdir=testdir),
+                '{tdir}/adjust-ulimits'.format(tdir=testdir),
                 'ceph-coverage',
                 '{tdir}/archive/coverage'.format(tdir=testdir),
                 '{tdir}/daemon-helper'.format(tdir=testdir),
@@ -172,7 +172,7 @@ def start_apache(ctx, config):
         (remote,) = ctx.cluster.only(client).remotes.keys()
         proc = remote.run(
             args=[
-                '{tdir}/enable-coredump'.format(tdir=testdir),
+                '{tdir}/adjust-ulimits'.format(tdir=testdir),
                 '{tdir}/daemon-helper'.format(tdir=testdir),
                 'kill'.format(tdir=testdir),
                 'apache2'.format(tdir=testdir),

diff --git a/teuthology/task/s3readwrite.py b/teuthology/task/s3readwrite.py
index 79bf537a447384cdaa55d35a614e7ed69f2202be..ce34c344d7d87dc20ac4d868daa4cf2d1b044b3e 100644 (file)
--- a/teuthology/task/s3readwrite.py
+++ b/teuthology/task/s3readwrite.py
@@ -71,7 +71,7 @@ def create_users(ctx, config):
             _config_user(s3tests_conf, section, '{user}.{client}'.format(user=user, client=client))
             ctx.cluster.only(client).run(
                 args=[
-                    '{tdir}/enable-coredump'.format(tdir=testdir),
+                    '{tdir}/adjust-ulimits'.format(tdir=testdir),
                     'ceph-coverage',
                     '{tdir}/archive/coverage'.format(tdir=testdir),
                     'radosgw-admin',
@@ -91,7 +91,7 @@ def create_users(ctx, config):
                 uid = '{user}.{client}'.format(user=user, client=client)
                 ctx.cluster.only(client).run(
                     args=[
-                        '{tdir}/enable-coredump'.format(tdir=testdir),
+                        '{tdir}/adjust-ulimits'.format(tdir=testdir),
                         'ceph-coverage',
                         '{tdir}/archive/coverage'.format(tdir=testdir),
                         'radosgw-admin',

diff --git a/teuthology/task/s3roundtrip.py b/teuthology/task/s3roundtrip.py
index 5065e5db0b708e418ffa670d8ab9255bf3e2529e..9aa5379b52bdf9c5303793fb953d817ee5c7b3b1 100644 (file)
--- a/teuthology/task/s3roundtrip.py
+++ b/teuthology/task/s3roundtrip.py
@@ -71,7 +71,7 @@ def create_users(ctx, config):
             _config_user(s3tests_conf, section, '{user}.{client}'.format(user=user, client=client))
             ctx.cluster.only(client).run(
                 args=[
-                    '{tdir}/enable-coredump'.format(tdir=testdir),
+                    '{tdir}/adjust-ulimits'.format(tdir=testdir),
                     'ceph-coverage',
                     '{tdir}/archive/coverage'.format(tdir=testdir),
                     'radosgw-admin',
@@ -91,7 +91,7 @@ def create_users(ctx, config):
                 uid = '{user}.{client}'.format(user=user, client=client)
                 ctx.cluster.only(client).run(
                     args=[
-                        '{tdir}/enable-coredump'.format(tdir=testdir),
+                        '{tdir}/adjust-ulimits'.format(tdir=testdir),
                         'ceph-coverage',
                         '{tdir}/archive/coverage'.format(tdir=testdir),
                         'radosgw-admin',

diff --git a/teuthology/task/s3tests.py b/teuthology/task/s3tests.py
index f2c4f281e6ac78d33fb5e3be85533c97ac68b355..abac99ede1cb8d9c483d1acba9513cb2c5bf8487 100644 (file)
--- a/teuthology/task/s3tests.py
+++ b/teuthology/task/s3tests.py
@@ -78,7 +78,7 @@ def create_users(ctx, config):
             _config_user(s3tests_conf, section, '{user}.{client}'.format(user=user, client=client))
             ctx.cluster.only(client).run(
                 args=[
-                    '{tdir}/enable-coredump'.format(tdir=testdir),
+                    '{tdir}/adjust-ulimits'.format(tdir=testdir),
                     'ceph-coverage',
                     '{tdir}/archive/coverage'.format(tdir=testdir),
                     'radosgw-admin',
@@ -98,7 +98,7 @@ def create_users(ctx, config):
                 uid = '{user}.{client}'.format(user=user, client=client)
                 ctx.cluster.only(client).run(
                     args=[
-                        '{tdir}/enable-coredump'.format(tdir=testdir),
+                        '{tdir}/adjust-ulimits'.format(tdir=testdir),
                         'ceph-coverage',
                         '{tdir}/archive/coverage'.format(tdir=testdir),
                         'radosgw-admin',

diff --git a/teuthology/task/swift.py b/teuthology/task/swift.py
index 520366ccbb3c986dd6e43024a162d53fc8cf806a..98bb22d3f7dc2301cee4e7e5ea834ad935a082e1 100644 (file)
--- a/teuthology/task/swift.py
+++ b/teuthology/task/swift.py
@@ -59,7 +59,7 @@ def create_users(ctx, config):
             _config_user(testswift_conf, '{user}.{client}'.format(user=user, client=client), user, suffix)
             ctx.cluster.only(client).run(
                 args=[
-                    '{tdir}/enable-coredump'.format(tdir=testdir),
+                    '{tdir}/adjust-ulimits'.format(tdir=testdir),
                     'ceph-coverage',
                     '{tdir}/archive/coverage'.format(tdir=testdir),
                     'radosgw-admin',
@@ -79,7 +79,7 @@ def create_users(ctx, config):
                 uid = '{user}.{client}'.format(user=user, client=client)
                 ctx.cluster.only(client).run(
                     args=[
-                        '{tdir}/enable-coredump'.format(tdir=testdir),
+                        '{tdir}/adjust-ulimits'.format(tdir=testdir),
                         'ceph-coverage',
                         '{tdir}/archive/coverage'.format(tdir=testdir),
                         'radosgw-admin',

diff --git a/teuthology/task/workunit.py b/teuthology/task/workunit.py
index ecc70b2ccd82858e4700d3053156a830bdd1784a..8d96b90270e6e13aea92dadc1fa7518fbd9267bb 100644 (file)
--- a/teuthology/task/workunit.py
+++ b/teuthology/task/workunit.py
@@ -287,7 +287,7 @@ def _run_tests(ctx, refspec, role, tests, env, subdir=None):
                         env_arg = '{var}={val}'.format(var=var, val=quoted_val)
                         args.append(run.Raw(env_arg))
                 args.extend([
-                        '{tdir}/enable-coredump'.format(tdir=testdir),
+                        '{tdir}/adjust-ulimits'.format(tdir=testdir),
                         'ceph-coverage',
                         '{tdir}/archive/coverage'.format(tdir=testdir),
                         '{srcdir}/{workunit}'.format(