From 9edf01c3c7596e82aecd31b1a5ee06916bea6dad Mon Sep 17 00:00:00 2001 From: Jinshan Xiong Date: Fri, 21 Oct 2011 11:07:30 -0700 Subject: [PATCH] LU-773 tests: sanity:test_105b failure The root cause of this issue is that activating osc in test sanity 104a wasn't successful. We should wait for the recovery to finish. Change-Id: I940419bfb1f579c4a0233b7439ac1f459ee584ad Signed-off-by: Jinshan Xiong Reviewed-on: http://review.whamcloud.com/1542 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/tests/sanity.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 4a71ed6..aeb9894 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -5097,10 +5097,13 @@ test_104a() { lfs df $DIR/$tfile || error "lfs df $DIR/$tfile failed" lfs df -ih $DIR/$tfile || error "lfs df -ih $DIR/$tfile failed" - OSC=`lctl get_param -n devices | awk '/-osc-/ {print $4}' | head -n 1` + OSC=`lctl dl |grep OST0000-osc-[^M] |awk '{print $4}'` lctl --device %$OSC deactivate lfs df || error "lfs df with deactivated OSC failed" lctl --device %$OSC activate + # wait the osc back to normal + wait_osc_import_state client ost FULL + lfs df || error "lfs df with reactivated OSC failed" rm -f $DIR/$tfile } -- 1.8.3.1