From 243189198481c9d261a383ae24de5060c82a02ab Mon Sep 17 00:00:00 2001 From: Vladimir Saveliev Date: Sat, 10 Feb 2018 13:21:44 +0300 Subject: [PATCH] LU-10655 tests: eliminate 'ssh exited with exit code 1' Eliminate meaningless 'ssh exited with exit code 1' issued by stop() and wait_exit_ST() Signed-off-by: Vladimir Saveliev Reviewed-by: Elena V. Gryaznova Cray-bug-id: MRP-1483 Change-Id: Ie1af3cda0b48b7bf482ea35b84c93e38d0f6c0a9 Test-Parameters: trivial Reviewed-on: https://review.whamcloud.com/31263 Reviewed-by: Elena Gryaznova Tested-by: Jenkins Reviewed-by: Sergey Cheremencev Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/tests/test-framework.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index df3608f..e43599e 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -1628,7 +1628,7 @@ stop() { [ -z $HOST ] && echo stop: no host for $facet && return 0 local mntpt=$(facet_mntpt $facet) - running=$(do_facet ${facet} "grep -c $mntpt' ' /proc/mounts") || true + running=$(do_facet ${facet} "grep -c $mntpt' ' /proc/mounts || true") if [ ${running} -ne 0 ]; then echo "Stopping $mntpt (opts:$@) on $HOST" do_facet ${facet} $UMOUNT $@ $mntpt @@ -2753,7 +2753,8 @@ wait_exit_ST () { local running # conf-sanity 31 takes a long time cleanup while [ $WAIT -lt 300 ]; do - running=$(do_facet ${facet} "lsmod | grep lnet > /dev/null && lctl dl | grep ' ST '") || true + running=$(do_facet ${facet} "lsmod | grep lnet > /dev/null && +lctl dl | grep ' ST ' || true") [ -z "${running}" ] && return 0 echo "waited $WAIT for${running}" [ $INTERVAL -lt 64 ] && INTERVAL=$((INTERVAL + INTERVAL)) -- 1.8.3.1