From 610fdc8ec3310c4f1afecc28bb77e4e9c8b24045 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Wed, 1 Feb 2017 20:37:49 +0100 Subject: [PATCH] nuke: drop remove_kernel_mounts() Calling remove_kernel_mounts() after reboot() is pretty useless. Also, as explained in the previous commit, there isn't much we can do in the krbd case, so just drop it. Signed-off-by: Ilya Dryomov --- teuthology/nuke/__init__.py | 3 +-- teuthology/nuke/actions.py | 19 ------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/teuthology/nuke/__init__.py b/teuthology/nuke/__init__.py index 502a694b1..733a6e6de 100644 --- a/teuthology/nuke/__init__.py +++ b/teuthology/nuke/__init__.py @@ -25,7 +25,7 @@ from ..task.internal import check_lock, add_remotes, connect from .actions import ( check_console, clear_firewall, shutdown_daemons, remove_installed_packages, reboot, remove_osd_mounts, remove_osd_tmpfs, kill_hadoop, - remove_kernel_mounts, remove_ceph_packages, synch_clocks, + remove_ceph_packages, synch_clocks, unlock_firmware_repo, remove_configuration_files, undo_multipath, reset_syslog_dir, remove_ceph_data, remove_testing_tree, remove_yum_timedhosts, kill_valgrind, @@ -329,7 +329,6 @@ def nuke_helper(ctx, should_unlock): remove_osd_mounts(ctx) remove_osd_tmpfs(ctx) kill_hadoop(ctx) - remove_kernel_mounts(ctx) remove_ceph_packages(ctx) synch_clocks(remotes) unlock_firmware_repo(ctx) diff --git a/teuthology/nuke/actions.py b/teuthology/nuke/actions.py index d3a3a53d5..de3ed28d1 100644 --- a/teuthology/nuke/actions.py +++ b/teuthology/nuke/actions.py @@ -95,25 +95,6 @@ def kill_valgrind(ctx): ) -def remove_kernel_mounts(ctx): - """ - properly we should be able to just do a forced unmount, - but that doesn't seem to be working, so you should reboot instead - """ - log.info("Removing kernel mounts...") - ctx.cluster.run( - args=[ - 'grep', 'ceph', '/etc/mtab', run.Raw('|'), - 'grep', '-o', "on /.* type", run.Raw('|'), - 'grep', '-o', "/.* ", run.Raw('|'), - 'xargs', '-r', - 'sudo', 'umount', '-f', run.Raw(';'), - ], - check_status=False, - timeout=60 - ) - - def remove_osd_mounts(ctx): """ unmount any osd data mounts (scratch disks) -- 2.47.3