From efb30e3152cf287bb91eac7b9e9605a5db1cccb5 Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Thu, 27 Aug 2020 17:08:37 +0000 Subject: [PATCH] LU-13931 Revert "LU-13688 hsm: handle in-tree executed copytools correctly" This seems to break in-tree static build testing This reverts commit 29bb063654c9a74d495e5d4cea17694a2b70f6a0. Change-Id: I1bb04fe2a48b4d7392a1306bd16a5bab296af1f5 Reviewed-on: https://review.whamcloud.com/39746 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/tests/sanity-hsm.sh | 8 ++++---- lustre/tests/test-framework.sh | 15 +++------------ 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/lustre/tests/sanity-hsm.sh b/lustre/tests/sanity-hsm.sh index 01f7e0a..15f9551 100755 --- a/lustre/tests/sanity-hsm.sh +++ b/lustre/tests/sanity-hsm.sh @@ -84,7 +84,7 @@ CLIENT2=${CLIENT2:-$CLIENT1} search_copytools() { local hosts=${1:-$(facet_active_host $SINGLEAGT)} - do_nodesv $hosts "pgrep -x $HSMTOOL_PKILL" + do_nodesv $hosts "libtool execute pgrep -x $HSMTOOL" } wait_copytools() { @@ -170,8 +170,8 @@ copytool_suspend() { local agents=${1:-$(facet_active_host $SINGLEAGT)} stack_trap \ - "do_nodesv $agents pkill -CONT -x '$HSMTOOL_PKILL' || true" EXIT - do_nodesv $agents "pkill -STOP -x $HSMTOOL_PKILL" || return 0 + "do_nodesv $agents libtool execute pkill -CONT -x '$HSMTOOL' || true" EXIT + do_nodesv $agents "libtool execute pkill -STOP -x $HSMTOOL" || return 0 echo "Copytool is suspended on $agents" } @@ -489,7 +489,7 @@ get_agent_uuid() { # Lustre mount-point is mandatory and last parameter on # copytool cmd-line. - local mntpnt=$(do_rpc_nodes $agent ps -C $HSMTOOL_KILL -o args= | + local mntpnt=$(do_rpc_nodes $agent libtool execute ps -C $HSMTOOL -o args= | awk '{print $NF}') [ -n "$mntpnt" ] || error "Found no Agent or with no mount-point "\ "parameter" diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index aa320f2..41ac61e 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -10032,15 +10032,6 @@ init_agt_vars() { export HSMTOOL_EVENT_FIFO=${HSMTOOL_EVENT_FIFO:=""} export HSMTOOL_TESTDIR - # Copytools invoked from within the source tree are executed through a - # libtool script and have a different process name - from_build_tree && LIBTOOL_PREFIX=lt- - - export HSMTOOL_KILL=${LIBTOOL_PREFIX}${HSMTOOL} - - # pgrep(1) and pkill(1) limit process name matching to 15 characters - export HSMTOOL_PKILL=${HSMTOOL_KILL:0:15} - HSM_ARCHIVE_NUMBER=2 # The test only support up to 10 MDTs @@ -10076,7 +10067,7 @@ get_mdt_devices() { copytool_continue() { local agents=${1:-$(facet_active_host $SINGLEAGT)} - do_nodesv $agents "pkill -CONT -x $HSMTOOL_PKILL" || return 0 + do_nodesv $agents "libtool execute pkill -CONT -x $HSMTOOL" || return 0 echo "Copytool is continued on $agents" } @@ -10084,7 +10075,7 @@ kill_copytools() { local hosts=${1:-$(facet_active_host $SINGLEAGT)} echo "Killing existing copytools on $hosts" - do_nodesv $hosts "killall -q $HSMTOOL_KILL" || true + do_nodesv $hosts "libtool execute killall -q $HSMTOOL" || true copytool_continue "$hosts" } @@ -10140,7 +10131,7 @@ __lhsmtool_setup() cmd+=" \"$mountpoint\"" echo "Starting copytool $facet on $(facet_host $facet)" - stack_trap "do_facet $facet pkill -x '$HSMTOOL_PKILL' || true" EXIT + stack_trap "do_facet $facet libtool execute pkill -x '$HSMTOOL' || true" EXIT do_facet $facet "$cmd < /dev/null > \"$(copytool_logfile $facet)\" 2>&1" } -- 1.8.3.1