LU-1866 misc: fix some issues found during LFSCK

[fs/lustre-release.git] / lustre / tests / sanity.sh

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index ffe70d6..3c5d753 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -5497,7 +5497,9 @@ function get_named_value()
     done
 }
 
-export CACHE_MAX=`$LCTL get_param -n llite.*.max_cached_mb | head -n 1`
+export CACHE_MAX=$($LCTL get_param -n llite.*.max_cached_mb |
+                  awk '/^max_cached_mb/ { print $2 }')
+
 cleanup_101a() {
        $LCTL set_param -n llite.*.max_cached_mb $CACHE_MAX
        trap 0
@@ -10519,6 +10521,7 @@ test_230b() {
        [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
        local MDTIDX=1
        local remote_dir=$DIR/$tdir/remote_dir
+       local rc=0
 
        mkdir -p $DIR/$tdir
        $LFS mkdir -i $MDTIDX $remote_dir ||
@@ -10527,6 +10530,13 @@ test_230b() {
        $LFS mkdir -i 0 $remote_dir/new_dir &&
                error "nested remote directory create succeed!"
 
+       do_facet mds$((MDTIDX + 1)) lctl set_param mdt.*.enable_remote_dir=1
+       $LFS mkdir -i 0 $remote_dir/new_dir || rc=$?
+       do_facet mds$((MDTIDX + 1)) lctl set_param mdt.*.enable_remote_dir=0
+
+       [ $rc -ne 0 ] &&
+          error "create remote directory failed after set enable_remote_dir"
+
        rm -r $DIR/$tdir || error "unlink remote directory failed"
 }
 run_test 230b "nested remote directory should be failed"