From d3a0d3ffe8c4e987f1f7f402469214a19d52c6db Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Mon, 22 Aug 2016 20:40:31 -0600 Subject: [PATCH] Kill valgrind.bin processes http://tracker.ceph.com/issues/17084 Fixes: 17084 Signed-off-by: Zack Cerza --- teuthology/nuke/__init__.py | 3 ++- teuthology/nuke/actions.py | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/teuthology/nuke/__init__.py b/teuthology/nuke/__init__.py index 8a3623e46c..db3f87a597 100644 --- a/teuthology/nuke/__init__.py +++ b/teuthology/nuke/__init__.py @@ -27,7 +27,7 @@ from .actions import ( reboot, remove_osd_mounts, remove_osd_tmpfs, kill_hadoop, remove_kernel_mounts, remove_ceph_packages, synch_clocks, remove_configuration_files, undo_multipath, reset_syslog_dir, - remove_testing_tree, remove_yum_timedhosts, + remove_testing_tree, remove_yum_timedhosts, kill_valgrind, ) log = logging.getLogger(__name__) @@ -325,6 +325,7 @@ def nuke_helper(ctx, should_unlock): log.info('Unmount ceph-fuse and killing daemons...') shutdown_daemons(ctx) log.info('All daemons killed.') + kill_valgrind(ctx) # Try to remove packages before reboot remove_installed_packages(ctx) diff --git a/teuthology/nuke/actions.py b/teuthology/nuke/actions.py index d9cd2d58fb..f6d6d1e2ef 100644 --- a/teuthology/nuke/actions.py +++ b/teuthology/nuke/actions.py @@ -76,6 +76,13 @@ def kill_hadoop(ctx): run.Raw("|"), 'xargs', 'kill', '-9', ], check_status=False, timeout=60) +def kill_valgrind(ctx): + # http://tracker.ceph.com/issues/17084 + ctx.cluster.run( + args=['sudo', 'pkill', '-f', '-9', 'valgrind.bin',], + check_status=False, + timeout=20, + ) def remove_kernel_mounts(ctx): """ -- 2.39.5