Branch HEAD

 b=20482
 i=adilger
----------------------------------------------------------------------
 Modified Files:
 	lustre/ChangeLog lustre/tests/conf-sanity.sh
----------------------------------------------------------------------
Description: Conf-sanity.sh 50g test - deactivated OST should not cause a panic.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 29d3184..ed5e041 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -14,6 +14,10 @@ tbd  Sun Microsystems, Inc.
        * File join has been disabled in this release, refer to Bugzilla 16929.
 
 Severity   : normal
+Bugzilla   : 20482
+Description: Conf-sanity.sh 50g test - deactivated OST should not cause a panic.
+
+Severity   : normal
 Bugzilla   : 18674
 Description: client could not reconnect to OST because of an active request.
 Details    : The client now retries to reconnect to the same server, if a

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index e9c63f0..53c5709 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -2027,6 +2027,29 @@ 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====================="
+
 test_51() {
        local LOCAL_TIMEOUT=20