LU-2592 tests: do not remove $TMP/*active in rpc.sh

The $TMP/*active files record the current active facets info
under failover test configuration. They are removed from
init_test_env() initially. If failover tests use do_rpc_nodes()
which performs rpc.sh and in which init_test_env() is used,
then the active facets info will be lost during the testing.

This patch fixes the above issue by introducing an RPC_MODE
variable which controls that the $TMP/*active files will not
be removed from init_test_env() in rpc.sh.

Test-Parameters: envdefinitions=SLOW=yes,ENABLE_QUOTA=yes clientcount=4 osscount=2 mdscount=2 austeroptions=-R failover=true useiscsi=true testlist=replay-vbr
Signed-off-by: Jian Yu <jian.yu@intel.com>
Change-Id: I24c560f2be92bbf6ab92e4d5de1905092eb926b4
Reviewed-on: http://review.whamcloud.com/5008
Tested-by: Hudson
Reviewed-by: Wei Liu <wei3.liu@intel.com>
Reviewed-by: Keith Mannthey <keith.mannthey@intel.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Johann Lombardi <johann.lombardi@intel.com>

diff --git a/lustre/tests/rpc.sh b/lustre/tests/rpc.sh
index 79c1327..e5db0d8 100755 (executable)
--- a/lustre/tests/rpc.sh
+++ b/lustre/tests/rpc.sh
@@ -9,7 +9,7 @@ if [ ! -f $LUSTRE/tests/rpc.sh ]; then
 fi
 
 . $LUSTRE/tests/test-framework.sh
 fi
 
 . $LUSTRE/tests/test-framework.sh

-init_test_env
+RPC_MODE=true init_test_env

 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 
 # Reset the trap on ERR set by the framework.  Noticing this failure is the
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 
 # Reset the trap on ERR set by the framework.  Noticing this failure is the

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index b0455e7..f127797 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -119,6 +119,7 @@ init_test_env() {
     export TESTSUITE=`basename $0 .sh`
     export TEST_FAILED=false
     export FAIL_ON_SKIP_ENV=${FAIL_ON_SKIP_ENV:-false}
     export TESTSUITE=`basename $0 .sh`
     export TEST_FAILED=false
     export FAIL_ON_SKIP_ENV=${FAIL_ON_SKIP_ENV:-false}

+    export RPC_MODE=${RPC_MODE:-false}

 
     export MKE2FS=${MKE2FS:-mke2fs}
     export DEBUGFS=${DEBUGFS:-debugfs}
 
     export MKE2FS=${MKE2FS:-mke2fs}
     export DEBUGFS=${DEBUGFS:-debugfs}


@@ -217,7 +218,9 @@ init_test_env() {
     DDETAILS=${DDETAILS:-false}
     [ "$TESTSUITELOG" ] && rm -f $TESTSUITELOG || true
     cntlog=0
     DDETAILS=${DDETAILS:-false}
     [ "$TESTSUITELOG" ] && rm -f $TESTSUITELOG || true
     cntlog=0

-    rm -f $TMP/*active
+    if ! $RPC_MODE; then
+        rm -f $TMP/*active
+    fi

 }
 
 case `uname -r` in
 }
 
 case `uname -r` in