From 72ec6eb3c74c85f54277aadfd9b83167ea8e81ec Mon Sep 17 00:00:00 2001 From: Hongchao Zhang Date: Sun, 17 Jul 2016 10:29:47 +0800 Subject: [PATCH] LU-8544 test: using lfs df in client_up With the patch http://review.whamcloud.com/#/c/19195/, the LL_SBI_LAZYSTATFS option will be used during statfs call, the "client_up" and "clients_up" in test-framework.sh should be updated to use "lfs df" to determine the UP state of clients Change-Id: I124e3ecc288f04b32dfd286f48e0ab75b1385a29 Signed-off-by: Hongchao Zhang Reviewed-on: http://review.whamcloud.com/22459 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Niu Yawei Reviewed-by: Yang Sheng Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/tests/test-framework.sh | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 8478fec..53d1072 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -2428,25 +2428,27 @@ wait_remote_prog () { return $rc } +lfs_df_check() { + local clients=${1:-$CLIENTS} + + if [ -z "$clients" ]; then + $LFS df $MOUNT + else + $PDSH $clients "$LFS df $MOUNT" > /dev/null + fi +} + + clients_up() { - # not every config has many clients - sleep 1 - if [ ! -z "$CLIENTS" ]; then - $PDSH $CLIENTS "stat -f $MOUNT" > /dev/null - else - stat -f $MOUNT > /dev/null - fi + # not every config has many clients + sleep 1 + lfs_df_check } client_up() { - local client=$1 - # usually checked on particular client or locally - sleep 1 - if [ ! -z "$client" ]; then - $PDSH $client "stat -f $MOUNT" > /dev/null - else - stat -f $MOUNT > /dev/null - fi + # usually checked on particular client or locally + sleep 1 + lfs_df_check $1 } client_evicted() { -- 1.8.3.1