From c63feda9eea3f38ad0acd68723d7401f462c5025 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Wed, 15 Aug 2012 14:00:05 -0400 Subject: [PATCH] LU-1745 test: Fix recovery-small test 105 Update check_target_ir_state() to handle the old IR reported state of ON/OFF as well as the new reported state of DISABLED/ ENABLED. Signed-off-by: James Simmons Change-Id: Ib2e10594cd2fb5d2e54d22187db32af9229e27ff Reviewed-on: http://review.whamcloud.com/3667 Reviewed-by: Andreas Dilger Tested-by: Hudson Tested-by: Maloo Reviewed-by: Jinshan Xiong Reviewed-by: Oleg Drokin --- lustre/tests/recovery-small.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh index c89558a..02b500a 100755 --- a/lustre/tests/recovery-small.sh +++ b/lustre/tests/recovery-small.sh @@ -1189,8 +1189,8 @@ check_target_ir_state() st=$(do_facet $target "lctl get_param -n $recovery_proc | awk '/IR:/{ print \\\$2}'") - [ $st != ON -o $st != OFF ] || - error "Error state $st, must be ON or OFF" + [ $st != ON -o $st != OFF -o $st != ENABLED -o $st != DISABLED ] || + error "Error state $st, must be ENABLED or DISABLED" echo -n $st } @@ -1455,7 +1455,8 @@ test_105() # make sure lustre mount at $rcli disabling IR local ir_state=$(check_cli_ir_state $rcli) - [ $ir_state = DISABLED -o $ir_state = "OFF" ] || error "IR state must be DISABLED at $rcli" + [ $ir_state = "DISABLED" -o $ir_state = "OFF" ] || + error "IR state must be DISABLED at $rcli" # Since the client just mounted, its last_rcvd entry is not on disk. # Send an RPC so exp_need_sync forces last_rcvd to commit this export -- 1.8.3.1