From 6e704244293aec98b39b8243fb2d13e2a8c9b674 Mon Sep 17 00:00:00 2001 From: Hongchao Zhang Date: Sat, 9 Feb 2013 05:24:48 +0800 Subject: [PATCH] LU-2194 test: avoid wrong eviction in recovery_small in subtest 19a and 19b of recovery_small, the locks from OST/MDT should be cancelled before "drop_ldlm_cancel" to avoid wrong eviction from OST/MDT for it will also drop its lock cancellation request. Change-Id: I49d1d189f6791224a3f132dc8cf2dd8b3d51d43e Signed-off-by: Hongchao Zhang Reviewed-on: http://review.whamcloud.com/5679 Reviewed-by: Fan Yong Reviewed-by: Jian Yu Tested-by: Hudson Reviewed-by: Nathaniel Clark Reviewed-by: Oleg Drokin --- lustre/tests/recovery-small.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh index c2cbac1..9641565 100755 --- a/lustre/tests/recovery-small.sh +++ b/lustre/tests/recovery-small.sh @@ -415,6 +415,9 @@ test_19a() { mount_client $DIR2 || error "failed to mount $DIR2" + # cancel cached locks from OST to avoid eviction from it + cancel_lru_locks osc + do_facet client "stat $DIR > /dev/null" || error "failed to stat $DIR: $?" drop_ldlm_cancel "chmod 0777 $DIR2" || @@ -439,6 +442,9 @@ test_19b() { mount_client $DIR2 || error "failed to mount $DIR2: $?" + # cancel cached locks from MDT to avoid eviction from it + cancel_lru_locks mdc + do_facet client $MULTIOP $DIR/$tfile Ow || error "failed to run multiop: $?" drop_ldlm_cancel $MULTIOP $DIR2/$tfile Ow || -- 1.8.3.1