From a7cccdbe06e98ea88af481f27eb56e02df36f624 Mon Sep 17 00:00:00 2001
From: dzogin <dzogin>
Date: Fri, 25 Sep 2009 18:16:15 +0000
Subject: [PATCH]  Branch b1_8  b=20482  i=adilger
 ---------------------------------------------------------------------- 
 Modified Files:   Tag: b1_8  	lustre/ChangeLog lustre/tests/conf-sanity.sh
 ----------------------------------------------------------------------
 Description: Conf-sanity.sh 50g test - deactivated OST should not cause a
 panic.

---
 lustre/ChangeLog            |  4 ++++
 lustre/tests/conf-sanity.sh | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 1eccae9..c8645bd 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -16,6 +16,10 @@ tbd Sun Microsystems, Inc.
 	  more information, please refer to bugzilla 17630.
 
 Severity   : normal
+Bugzilla   : 20482
+Description: Conf-sanity.sh 50g test - deactivated OST should not cause a panic.
+
+Severity   : normal
 Bugzilla   : 18674
 Description: Conf-sanity.sh test to check client reconnection to a busy server.
 
diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index ba8ed3b..7be1dfb 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1936,5 +1936,28 @@ test_50f() {
 }
 run_test 50f "normal statfs one server in down =========================="
 
+test_50g() {
+	[ "$OSTCOUNT" -lt "2" ] && skip_env "$OSTCOUNT < 2, skipping" && return
+	setup
+	start_ost2 || error "Unable to start OST2"
+
+	local PARAM="${FSNAME}-OST0001.osc.active"
+
+	$LFS setstripe -c -1 $DIR/$tfile || error "Unable to lfs setstripe"
+	do_facet mgs $LCTL conf_param $PARAM=0 || error "Unable to deactivate OST"
+
+	umount_client $MOUNT || error "Unable to unmount client"
+	mount_client $MOUNT || error "Unable to mount client"
+	# This df should not cause a panic
+	df -k $MOUNT
+
+	do_facet mgs $LCTL conf_param $PARAM=1 || error "Unable to activate OST"
+	rm -f $DIR/$tfile
+	umount_client $MOUNT || error "Unable to unmount client"
+	stop_ost2 || error "Unable to stop OST2"
+	cleanup_nocli
+}
+run_test 50g "deactivated OST should not cause panic====================="
+
 equals_msg `basename $0`: test complete
 [ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG && grep -q FAIL $TESTSUITELOG && exit 1 || true
-- 
1.8.3.1