From: Elena Gryaznova <elena.gryaznova@seagate.com>
Date: Fri, 18 Nov 2016 19:29:34 +0000 (+0200)
Subject: LU-8805 tests: fix defect introduced by LU-8226
X-Git-Tag: 2.9.0-RC1~6
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F61%2F23861%2F2;p=fs%2Flustre-release.git

LU-8805 tests: fix defect introduced by LU-8226

client loads run_tar.sh, run_dd.sh, etc. are
executed on remote nodes; ps -C does not select them
on main client.

Test-parameters: trivial testlist=recovery-mds-scale

Seagate-bug-id: MRP-4011
Signed-off-by: Elena Gryaznova <elena.gryaznova@seagate.com>
Change-Id: Iaa066298f96b14af148007410f29f5c7b965ee2c
Reviewed-on: http://review.whamcloud.com/23861
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 57070ce..9436a7c 100755
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -1937,7 +1937,7 @@ check_client_load () {
 	local var=$(node_var_name $client)_load
 	local testload=run_${!var}.sh
 
-	ps -C $testload | grep $client || return 1
+	ps auxww | grep -v grep | grep $client | grep -q $testload || return 1
 
 	# bug 18914: try to connect several times not only when
 	# check ps, but  while check_node_health also