From af4411d6afa93acccebd791b6e974fd84ca8eb33 Mon Sep 17 00:00:00 2001 From: "John L. Hammond" Date: Tue, 10 May 2016 09:36:42 -0500 Subject: [PATCH] LU-6937 test: use ps in get_agent_uuid() Use 'ps -C $HSMTOOL_BASE -o args=' rather than 'pgrep -fl $HSMTOOL_BASE' to get the copytool command line. Signed-off-by: John L. Hammond Change-Id: Idb1238966de1a8bea5d5c225632936d8c0a88529 Reviewed-on: http://review.whamcloud.com/20093 Reviewed-by: Minh Diep Tested-by: Jenkins Reviewed-by: Bob Glossman Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/tests/sanity-hsm.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lustre/tests/sanity-hsm.sh b/lustre/tests/sanity-hsm.sh index 6c7b890..014bf41 100755 --- a/lustre/tests/sanity-hsm.sh +++ b/lustre/tests/sanity-hsm.sh @@ -3620,8 +3620,8 @@ get_agent_uuid() { # Lustre mount-point is mandatory and last parameter on # copytool cmd-line. - local mntpnt=$(do_rpc_nodes $agent pgrep -fl $HSMTOOL_BASE | - grep -v pgrep | awk '{print $NF}') + local mntpnt=$(do_rpc_nodes $agent ps -C $HSMTOOL_BASE -o args= | + awk '{print $NF}') [ -n "$mntpnt" ] || error "Found no Agent or with no mount-point "\ "parameter" do_rpc_nodes $agent get_client_uuid $mntpnt | cut -d' ' -f2 -- 1.8.3.1