Whamcloud - gitweb
LU-8544 test: using lfs df in client_up 59/22459/4
authorHongchao Zhang <hongchao.zhang@intel.com>
Sun, 17 Jul 2016 02:29:47 +0000 (10:29 +0800)
committerOleg Drokin <oleg.drokin@intel.com>
Thu, 29 Sep 2016 14:59:00 +0000 (14:59 +0000)
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 <hongchao.zhang@intel.com>
Reviewed-on: http://review.whamcloud.com/22459
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Niu Yawei <yawei.niu@intel.com>
Reviewed-by: Yang Sheng <yang.sheng@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lustre/tests/test-framework.sh

index 8478fec..53d1072 100755 (executable)
@@ -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() {