From e2ed89f05f0c1d01941e172287f36d09cbc07500 Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Wed, 14 Dec 2022 01:21:34 -0500 Subject: [PATCH] qa: remove qa/suites/marginal and restart task marginal suite was probably used sometime back and seems obsolete now. Remove it and its corresponding restart task. Signed-off-by: Venky Shankar --- qa/suites/marginal/.qa | 1 - qa/suites/marginal/basic/% | 0 qa/suites/marginal/basic/.qa | 1 - qa/suites/marginal/basic/clusters/.qa | 1 - .../marginal/basic/clusters/fixed-3.yaml | 4 - qa/suites/marginal/basic/tasks/.qa | 1 - .../kclient_workunit_suites_blogbench.yaml | 8 - .../tasks/kclient_workunit_suites_fsx.yaml | 19 --- qa/suites/marginal/fs-misc/% | 0 qa/suites/marginal/fs-misc/.qa | 1 - qa/suites/marginal/fs-misc/clusters/.qa | 1 - .../fs-misc/clusters/two_clients.yaml | 4 - qa/suites/marginal/fs-misc/tasks/.qa | 1 - .../marginal/fs-misc/tasks/locktest.yaml | 5 - qa/suites/marginal/mds_restart/% | 0 qa/suites/marginal/mds_restart/.qa | 1 - qa/suites/marginal/mds_restart/clusters/.qa | 1 - .../mds_restart/clusters/one_mds.yaml | 4 - qa/suites/marginal/mds_restart/tasks/.qa | 1 - .../tasks/restart-workunit-backtraces.yaml | 11 -- qa/suites/marginal/multimds/% | 0 qa/suites/marginal/multimds/.qa | 1 - qa/suites/marginal/multimds/clusters/.qa | 1 - .../multimds/clusters/3-node-3-mds.yaml | 5 - .../multimds/clusters/3-node-9-mds.yaml | 5 - qa/suites/marginal/multimds/mounts/.qa | 1 - .../marginal/multimds/mounts/ceph-fuse.yaml | 7 - .../marginal/multimds/mounts/kclient.yaml | 4 - qa/suites/marginal/multimds/tasks/.qa | 1 - .../multimds/tasks/workunit_misc.yaml | 5 - .../tasks/workunit_suites_blogbench.yaml | 5 - .../tasks/workunit_suites_dbench.yaml | 5 - .../tasks/workunit_suites_fsstress.yaml | 5 - .../multimds/tasks/workunit_suites_fsync.yaml | 5 - .../multimds/tasks/workunit_suites_pjd.yaml | 10 -- .../tasks/workunit_suites_truncate_delay.yaml | 15 -- qa/suites/marginal/multimds/thrash/.qa | 1 - .../marginal/multimds/thrash/exports.yaml | 5 - .../marginal/multimds/thrash/normal.yaml | 0 qa/tasks/restart.py | 161 ------------------ 40 files changed, 307 deletions(-) delete mode 120000 qa/suites/marginal/.qa delete mode 100644 qa/suites/marginal/basic/% delete mode 120000 qa/suites/marginal/basic/.qa delete mode 120000 qa/suites/marginal/basic/clusters/.qa delete mode 100644 qa/suites/marginal/basic/clusters/fixed-3.yaml delete mode 120000 qa/suites/marginal/basic/tasks/.qa delete mode 100644 qa/suites/marginal/basic/tasks/kclient_workunit_suites_blogbench.yaml delete mode 100644 qa/suites/marginal/basic/tasks/kclient_workunit_suites_fsx.yaml delete mode 100644 qa/suites/marginal/fs-misc/% delete mode 120000 qa/suites/marginal/fs-misc/.qa delete mode 120000 qa/suites/marginal/fs-misc/clusters/.qa delete mode 100644 qa/suites/marginal/fs-misc/clusters/two_clients.yaml delete mode 120000 qa/suites/marginal/fs-misc/tasks/.qa delete mode 100644 qa/suites/marginal/fs-misc/tasks/locktest.yaml delete mode 100644 qa/suites/marginal/mds_restart/% delete mode 120000 qa/suites/marginal/mds_restart/.qa delete mode 120000 qa/suites/marginal/mds_restart/clusters/.qa delete mode 100644 qa/suites/marginal/mds_restart/clusters/one_mds.yaml delete mode 120000 qa/suites/marginal/mds_restart/tasks/.qa delete mode 100644 qa/suites/marginal/mds_restart/tasks/restart-workunit-backtraces.yaml delete mode 100644 qa/suites/marginal/multimds/% delete mode 120000 qa/suites/marginal/multimds/.qa delete mode 120000 qa/suites/marginal/multimds/clusters/.qa delete mode 100644 qa/suites/marginal/multimds/clusters/3-node-3-mds.yaml delete mode 100644 qa/suites/marginal/multimds/clusters/3-node-9-mds.yaml delete mode 120000 qa/suites/marginal/multimds/mounts/.qa delete mode 100644 qa/suites/marginal/multimds/mounts/ceph-fuse.yaml delete mode 100644 qa/suites/marginal/multimds/mounts/kclient.yaml delete mode 120000 qa/suites/marginal/multimds/tasks/.qa delete mode 100644 qa/suites/marginal/multimds/tasks/workunit_misc.yaml delete mode 100644 qa/suites/marginal/multimds/tasks/workunit_suites_blogbench.yaml delete mode 100644 qa/suites/marginal/multimds/tasks/workunit_suites_dbench.yaml delete mode 100644 qa/suites/marginal/multimds/tasks/workunit_suites_fsstress.yaml delete mode 100644 qa/suites/marginal/multimds/tasks/workunit_suites_fsync.yaml delete mode 100644 qa/suites/marginal/multimds/tasks/workunit_suites_pjd.yaml delete mode 100644 qa/suites/marginal/multimds/tasks/workunit_suites_truncate_delay.yaml delete mode 120000 qa/suites/marginal/multimds/thrash/.qa delete mode 100644 qa/suites/marginal/multimds/thrash/exports.yaml delete mode 100644 qa/suites/marginal/multimds/thrash/normal.yaml delete mode 100644 qa/tasks/restart.py diff --git a/qa/suites/marginal/.qa b/qa/suites/marginal/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/marginal/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/marginal/basic/% b/qa/suites/marginal/basic/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/qa/suites/marginal/basic/.qa b/qa/suites/marginal/basic/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/marginal/basic/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/marginal/basic/clusters/.qa b/qa/suites/marginal/basic/clusters/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/marginal/basic/clusters/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/marginal/basic/clusters/fixed-3.yaml b/qa/suites/marginal/basic/clusters/fixed-3.yaml deleted file mode 100644 index 5e23c9e4f44c8..0000000000000 --- a/qa/suites/marginal/basic/clusters/fixed-3.yaml +++ /dev/null @@ -1,4 +0,0 @@ -roles: -- [mon.a, mon.c, osd.0, osd.1, osd.2] -- [mon.b, mgr.x, mds.a, osd.3, osd.4, osd.5] -- [client.0] diff --git a/qa/suites/marginal/basic/tasks/.qa b/qa/suites/marginal/basic/tasks/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/marginal/basic/tasks/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/marginal/basic/tasks/kclient_workunit_suites_blogbench.yaml b/qa/suites/marginal/basic/tasks/kclient_workunit_suites_blogbench.yaml deleted file mode 100644 index 4f25d80631382..0000000000000 --- a/qa/suites/marginal/basic/tasks/kclient_workunit_suites_blogbench.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- install: -- ceph: -- kclient: -- workunit: - clients: - all: - - suites/blogbench.sh diff --git a/qa/suites/marginal/basic/tasks/kclient_workunit_suites_fsx.yaml b/qa/suites/marginal/basic/tasks/kclient_workunit_suites_fsx.yaml deleted file mode 100644 index bfbb8d3dbbb15..0000000000000 --- a/qa/suites/marginal/basic/tasks/kclient_workunit_suites_fsx.yaml +++ /dev/null @@ -1,19 +0,0 @@ -tasks: -- install: - extra_system_packages: - deb: - - libaio-dev - - libtool-bin - - uuid-dev - - xfslibs-dev - rpm: - - libaio-devel - - libtool - - libuuid-devel - - xfsprogs-devel -- ceph: -- kclient: -- workunit: - clients: - all: - - suites/fsx.sh diff --git a/qa/suites/marginal/fs-misc/% b/qa/suites/marginal/fs-misc/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/qa/suites/marginal/fs-misc/.qa b/qa/suites/marginal/fs-misc/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/marginal/fs-misc/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/marginal/fs-misc/clusters/.qa b/qa/suites/marginal/fs-misc/clusters/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/marginal/fs-misc/clusters/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/marginal/fs-misc/clusters/two_clients.yaml b/qa/suites/marginal/fs-misc/clusters/two_clients.yaml deleted file mode 100644 index 19d312dce5796..0000000000000 --- a/qa/suites/marginal/fs-misc/clusters/two_clients.yaml +++ /dev/null @@ -1,4 +0,0 @@ -roles: -- [mon.a, mon.b, mon.c, mgr.x, mds.a, osd.0, osd.1, osd.2] -- [client.1] -- [client.0] diff --git a/qa/suites/marginal/fs-misc/tasks/.qa b/qa/suites/marginal/fs-misc/tasks/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/marginal/fs-misc/tasks/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/marginal/fs-misc/tasks/locktest.yaml b/qa/suites/marginal/fs-misc/tasks/locktest.yaml deleted file mode 100644 index 444bb1f19b358..0000000000000 --- a/qa/suites/marginal/fs-misc/tasks/locktest.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- install: -- ceph: -- kclient: -- locktest: [client.0, client.1] diff --git a/qa/suites/marginal/mds_restart/% b/qa/suites/marginal/mds_restart/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/qa/suites/marginal/mds_restart/.qa b/qa/suites/marginal/mds_restart/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/marginal/mds_restart/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/marginal/mds_restart/clusters/.qa b/qa/suites/marginal/mds_restart/clusters/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/marginal/mds_restart/clusters/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/marginal/mds_restart/clusters/one_mds.yaml b/qa/suites/marginal/mds_restart/clusters/one_mds.yaml deleted file mode 100644 index 45c3e80e57d81..0000000000000 --- a/qa/suites/marginal/mds_restart/clusters/one_mds.yaml +++ /dev/null @@ -1,4 +0,0 @@ -roles: -- [mon.a, mon.b, mon.c, mgr.x, osd.0, osd.1, osd.2] -- [mds.a] -- [client.0] diff --git a/qa/suites/marginal/mds_restart/tasks/.qa b/qa/suites/marginal/mds_restart/tasks/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/marginal/mds_restart/tasks/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/marginal/mds_restart/tasks/restart-workunit-backtraces.yaml b/qa/suites/marginal/mds_restart/tasks/restart-workunit-backtraces.yaml deleted file mode 100644 index d086d4cf8d3e6..0000000000000 --- a/qa/suites/marginal/mds_restart/tasks/restart-workunit-backtraces.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: -- install: -- ceph: - conf: - mds: - mds log segment size: 16384 - mds log max segments: 1 -- restart: - exec: - client.0: - - test-backtraces.py diff --git a/qa/suites/marginal/multimds/% b/qa/suites/marginal/multimds/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/qa/suites/marginal/multimds/.qa b/qa/suites/marginal/multimds/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/marginal/multimds/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/marginal/multimds/clusters/.qa b/qa/suites/marginal/multimds/clusters/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/marginal/multimds/clusters/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/marginal/multimds/clusters/3-node-3-mds.yaml b/qa/suites/marginal/multimds/clusters/3-node-3-mds.yaml deleted file mode 100644 index 2995ea9f358cc..0000000000000 --- a/qa/suites/marginal/multimds/clusters/3-node-3-mds.yaml +++ /dev/null @@ -1,5 +0,0 @@ -roles: -- [mon.a, mon.c, mds.a, osd.0, osd.1, osd.2] -- [mon.b, mgr.x, mds.b, mds.c, osd.3, osd.4, osd.5] -- [client.0] -- [client.1] diff --git a/qa/suites/marginal/multimds/clusters/3-node-9-mds.yaml b/qa/suites/marginal/multimds/clusters/3-node-9-mds.yaml deleted file mode 100644 index 083a07c25e109..0000000000000 --- a/qa/suites/marginal/multimds/clusters/3-node-9-mds.yaml +++ /dev/null @@ -1,5 +0,0 @@ -roles: -- [mon.a, mon.c, mds.a, mds.b, mds.c, mds.d, osd.0, osd.1, osd.2] -- [mon.b, mgr.x, mds.e, mds.f, mds.g, mds.h, mds.i, osd.3, osd.4, osd.5] -- [client.0] -- [client.1] diff --git a/qa/suites/marginal/multimds/mounts/.qa b/qa/suites/marginal/multimds/mounts/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/marginal/multimds/mounts/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/marginal/multimds/mounts/ceph-fuse.yaml b/qa/suites/marginal/multimds/mounts/ceph-fuse.yaml deleted file mode 100644 index 55d8beb00e9ce..0000000000000 --- a/qa/suites/marginal/multimds/mounts/ceph-fuse.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- install: -- ceph: - conf: - client: - fuse_default_permissions: 0 -- ceph-fuse: diff --git a/qa/suites/marginal/multimds/mounts/kclient.yaml b/qa/suites/marginal/multimds/mounts/kclient.yaml deleted file mode 100644 index c18db8f5ea61d..0000000000000 --- a/qa/suites/marginal/multimds/mounts/kclient.yaml +++ /dev/null @@ -1,4 +0,0 @@ -tasks: -- install: -- ceph: -- kclient: diff --git a/qa/suites/marginal/multimds/tasks/.qa b/qa/suites/marginal/multimds/tasks/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/marginal/multimds/tasks/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/marginal/multimds/tasks/workunit_misc.yaml b/qa/suites/marginal/multimds/tasks/workunit_misc.yaml deleted file mode 100644 index aa62b9e8c3ad0..0000000000000 --- a/qa/suites/marginal/multimds/tasks/workunit_misc.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - fs/misc diff --git a/qa/suites/marginal/multimds/tasks/workunit_suites_blogbench.yaml b/qa/suites/marginal/multimds/tasks/workunit_suites_blogbench.yaml deleted file mode 100644 index 4c1fcc11ed906..0000000000000 --- a/qa/suites/marginal/multimds/tasks/workunit_suites_blogbench.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/blogbench.sh diff --git a/qa/suites/marginal/multimds/tasks/workunit_suites_dbench.yaml b/qa/suites/marginal/multimds/tasks/workunit_suites_dbench.yaml deleted file mode 100644 index 41b2bc8edaab2..0000000000000 --- a/qa/suites/marginal/multimds/tasks/workunit_suites_dbench.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/dbench.sh diff --git a/qa/suites/marginal/multimds/tasks/workunit_suites_fsstress.yaml b/qa/suites/marginal/multimds/tasks/workunit_suites_fsstress.yaml deleted file mode 100644 index ddb18fb791aa2..0000000000000 --- a/qa/suites/marginal/multimds/tasks/workunit_suites_fsstress.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/fsstress.sh diff --git a/qa/suites/marginal/multimds/tasks/workunit_suites_fsync.yaml b/qa/suites/marginal/multimds/tasks/workunit_suites_fsync.yaml deleted file mode 100644 index 7efa1adb82da8..0000000000000 --- a/qa/suites/marginal/multimds/tasks/workunit_suites_fsync.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - suites/fsync-tester.sh diff --git a/qa/suites/marginal/multimds/tasks/workunit_suites_pjd.yaml b/qa/suites/marginal/multimds/tasks/workunit_suites_pjd.yaml deleted file mode 100644 index ba168e0fff2a8..0000000000000 --- a/qa/suites/marginal/multimds/tasks/workunit_suites_pjd.yaml +++ /dev/null @@ -1,10 +0,0 @@ -overrides: - ceph: - conf: - client: - fuse set user groups: true -tasks: -- workunit: - clients: - all: - - suites/pjd.sh diff --git a/qa/suites/marginal/multimds/tasks/workunit_suites_truncate_delay.yaml b/qa/suites/marginal/multimds/tasks/workunit_suites_truncate_delay.yaml deleted file mode 100644 index 3aa5f8825ac28..0000000000000 --- a/qa/suites/marginal/multimds/tasks/workunit_suites_truncate_delay.yaml +++ /dev/null @@ -1,15 +0,0 @@ -tasks: -- install: -- ceph: - conf: - client: - ms_inject_delay_probability: 1 - ms_inject_delay_type: osd - ms_inject_delay_max: 5 - client_oc_max_dirty_age: 1 -- ceph-fuse: -- exec: - client.0: - - dd if=/dev/zero of=./foo count=100 - - sleep 2 - - truncate --size 0 ./foo diff --git a/qa/suites/marginal/multimds/thrash/.qa b/qa/suites/marginal/multimds/thrash/.qa deleted file mode 120000 index a602a0353e751..0000000000000 --- a/qa/suites/marginal/multimds/thrash/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/marginal/multimds/thrash/exports.yaml b/qa/suites/marginal/multimds/thrash/exports.yaml deleted file mode 100644 index 240b46dfd8a7e..0000000000000 --- a/qa/suites/marginal/multimds/thrash/exports.yaml +++ /dev/null @@ -1,5 +0,0 @@ -overrides: - ceph: - conf: - mds: - mds thrash exports: 1 diff --git a/qa/suites/marginal/multimds/thrash/normal.yaml b/qa/suites/marginal/multimds/thrash/normal.yaml deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/qa/tasks/restart.py b/qa/tasks/restart.py deleted file mode 100644 index 4053bd2cb4433..0000000000000 --- a/qa/tasks/restart.py +++ /dev/null @@ -1,161 +0,0 @@ -""" -Daemon restart -""" -import logging -import pipes -import os - -from teuthology import misc as teuthology -from teuthology.orchestra import run as tor - -from teuthology.orchestra import run -log = logging.getLogger(__name__) - -def restart_daemon(ctx, config, role, id_, *args): - """ - Handle restart (including the execution of the command parameters passed) - """ - log.info('Restarting {r}.{i} daemon...'.format(r=role, i=id_)) - daemon = ctx.daemons.get_daemon(role, id_) - log.debug('Waiting for exit of {r}.{i} daemon...'.format(r=role, i=id_)) - try: - daemon.wait_for_exit() - except tor.CommandFailedError as e: - log.debug('Command Failed: {e}'.format(e=e)) - if len(args) > 0: - confargs = ['--{k}={v}'.format(k=k, v=v) for k,v in zip(args[0::2], args[1::2])] - log.debug('Doing restart of {r}.{i} daemon with args: {a}...'.format(r=role, i=id_, a=confargs)) - daemon.restart_with_args(confargs) - else: - log.debug('Doing restart of {r}.{i} daemon...'.format(r=role, i=id_)) - daemon.restart() - -def get_tests(ctx, config, role, remote, testdir): - """Download restart tests""" - srcdir = '{tdir}/restart.{role}'.format(tdir=testdir, role=role) - - refspec = config.get('branch') - if refspec is None: - refspec = config.get('sha1') - if refspec is None: - refspec = config.get('tag') - if refspec is None: - refspec = 'HEAD' - log.info('Pulling restart qa/workunits from ref %s', refspec) - - remote.run( - logger=log.getChild(role), - args=[ - 'mkdir', '--', srcdir, - run.Raw('&&'), - 'git', - 'clone', - 'https://git.ceph.com/ceph.git', - srcdir, - run.Raw('&&'), - 'cd', '--', srcdir, - run.Raw('&&'), - 'git', 'checkout', '-b', 'restart_test', str(refspec), - run.Raw('&&'), - 'cd', '--', 'qa/workunits', - run.Raw('&&'), - 'if', 'test', '-e', 'Makefile', run.Raw(';'), 'then', 'make', run.Raw(';'), 'fi', - run.Raw('&&'), - 'find', '-executable', '-type', 'f', '-printf', r'%P\0', - run.Raw('>{tdir}/restarts.list'.format(tdir=testdir)), - ], - ) - restarts = sorted(remote.read_file(f'{testdir}/restarts.list').decode().split('\0')) - return (os.path.join(srcdir, 'qa/workunits'), restarts) - -def task(ctx, config): - """ - Execute commands and allow daemon restart with config options. - Each process executed can output to stdout restart commands of the form: - restart - This will restart the daemon . with the specified config values once - by modifying the conf file with those values, and then replacing the old conf file - once the daemon is restarted. - This task does not kill a running daemon, it assumes the daemon will abort on an - assert specified in the config. - - tasks: - - install: - - ceph: - - restart: - exec: - client.0: - - test_backtraces.py - - """ - assert isinstance(config, dict), "task kill got invalid config" - - testdir = teuthology.get_testdir(ctx) - - try: - assert 'exec' in config, "config requires exec key with : entries" - for role, task in config['exec'].items(): - log.info('restart for role {r}'.format(r=role)) - (remote,) = ctx.cluster.only(role).remotes.keys() - srcdir, restarts = get_tests(ctx, config, role, remote, testdir) - log.info('Running command on role %s host %s', role, remote.name) - spec = '{spec}'.format(spec=task[0]) - log.info('Restarts list: %s', restarts) - log.info('Spec is %s', spec) - to_run = [w for w in restarts if w == task or w.find(spec) != -1] - log.info('To run: %s', to_run) - for c in to_run: - log.info('Running restart script %s...', c) - args = [ - run.Raw('TESTDIR="{tdir}"'.format(tdir=testdir)), - ] - env = config.get('env') - if env is not None: - for var, val in env.items(): - quoted_val = pipes.quote(val) - env_arg = '{var}={val}'.format(var=var, val=quoted_val) - args.append(run.Raw(env_arg)) - args.extend([ - 'adjust-ulimits', - 'ceph-coverage', - '{tdir}/archive/coverage'.format(tdir=testdir), - '{srcdir}/{c}'.format( - srcdir=srcdir, - c=c, - ), - ]) - proc = remote.run( - args=args, - stdout=tor.PIPE, - stdin=tor.PIPE, - stderr=log, - wait=False, - ) - log.info('waiting for a command from script') - while True: - l = proc.stdout.readline() - if not l or l == '': - break - log.debug('script command: {c}'.format(c=l)) - ll = l.strip() - cmd = ll.split(' ') - if cmd[0] == "done": - break - assert cmd[0] == 'restart', "script sent invalid command request to kill task" - # cmd should be: restart - # or to clear, just: restart - restart_daemon(ctx, config, cmd[1], cmd[2], *cmd[3:]) - proc.stdin.writelines(['restarted\n']) - proc.stdin.flush() - try: - proc.wait() - except tor.CommandFailedError: - raise Exception('restart task got non-zero exit status from script: {s}'.format(s=c)) - finally: - log.info('Finishing %s on %s...', task, role) - remote.run( - logger=log.getChild(role), - args=[ - 'rm', '-rf', '--', '{tdir}/restarts.list'.format(tdir=testdir), srcdir, - ], - ) -- 2.39.5