LU-1538 tests: keep /sbin/mount.lustre until cleanup

[fs/lustre-release.git] / lustre / tests / test-framework.sh

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 816078a..87981a4 100755 (executable)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -539,15 +539,25 @@ load_modules_local() {
        $LCTL modules > $OGDB/ogdb-$HOSTNAME
 
        # 'mount' doesn't look in $PATH, just sbin
-       local MOUNT_LUSTRE=$LUSTRE/utils/mount.lustre
-       if [ -f $MOUNT_LUSTRE ]; then
-               if grep -qe "/sbin/mount\.lustre " /proc/mounts; then
-                       cmp $MOUNT_LUSTRE /sbin/mount.lustre ||
-                               umount /sbin/mount.lustre
+       local mount_lustre=$LUSTRE/utils/mount.lustre
+       if [ -f $mount_lustre ]; then
+               local sbin_mount=/sbin/mount.lustre
+               if grep -qe "$sbin_mount " /proc/mounts; then
+                       cmp $mount_lustre $sbin_mount || umount $sbin_mount
                fi
-               if ! grep -qe "/sbin/mount\.lustre " /proc/mounts; then
-                       [ ! -f /sbin/mount.lustre ] && touch /sbin/mount.lustre
-                       mount --bind $MOUNT_LUSTRE /sbin/mount.lustre
+               if ! grep -qe "$sbin_mount " /proc/mounts; then
+                       if [ ! -s "$sbin_mount" ]; then
+                               cat <<- EOF > "$sbin_mount"
+                               #!/bin/sh
+                               #STUB MARK
+                               echo "This $sbin_mount just a mountpoint." 1>&2
+                               echo "It is never supposed to be run." 1>&2
+                               logger -p emerg -- "using stub $sbin_mount $@"
+                               exit 1
+                               EOF
+                               chmod a+x $sbin_mount
+                       fi
+                       mount --bind $mount_lustre $sbin_mount
                fi
        fi
 }
@@ -593,16 +603,17 @@ unload_modules() {
                fi
        fi
 
-    if grep -qe "/sbin/mount\.lustre" /proc/mounts; then
-        umount /sbin/mount.lustre || true
-        [ -w /sbin/mount.lustre -a ! -s /sbin/mount.lustre ] && \
-            rm -f /sbin/mount.lustre || true
-    fi
+       local sbin_mount=/sbin/mount.lustre
+       if grep -qe "$sbin_mount " /proc/mounts; then
+               umount $sbin_mount || true
+               [ -s $sbin_mount ] && ! grep -q "STUB MARK" $sbin_mount ||
+                       rm -f $sbin_mount
+       fi
 
-    check_mem_leak || return 254
+       check_mem_leak || return 254
 
-    echo "modules unloaded."
-    return 0
+       echo "modules unloaded."
+       return 0
 }
 
 fs_log_size() {
@@ -1183,12 +1194,19 @@ start() {
         eval export ${facet}failover_dev=$device
     fi
 
-    local mntpt=$(facet_mntpt $facet)
-    do_facet ${facet} mkdir -p $mntpt
-    eval export ${facet}_MOUNT=$mntpt
-    mount_facet ${facet}
-    RC=$?
-    return $RC
+       local mntpt=$(facet_mntpt $facet)
+       do_facet ${facet} mkdir -p $mntpt
+       eval export ${facet}_MOUNT=$mntpt
+       mount_facet ${facet}
+       RC=$?
+
+       if [[ $facet == mds* ]]; then
+               do_facet $facet \
+                       lctl set_param -n mdt.${FSNAME}*.enable_remote_dir=1 \
+                               2>/dev/null
+       fi
+
+       return $RC
 }
 
 stop() {
@@ -3857,6 +3875,13 @@ check_and_setup_lustre() {
                set_flavor_all $SEC
        fi
 
+       #Enable remote MDT create for testing
+       for num in $(seq $MDSCOUNT); do
+               do_facet mds$num \
+                       lctl set_param -n mdt.${FSNAME}*.enable_remote_dir=1 \
+                               2>/dev/null
+       done
+
        if [ "$ONLY" == "setup" ]; then
                exit 0
        fi
@@ -4095,10 +4120,6 @@ check_and_cleanup_lustre() {
                cleanupall -f || error "cleanup failed"
                unset I_MOUNTED
        fi
-
-       if grep -qe "/sbin/mount\.lustre " /proc/mounts; then
-               umount /sbin/mount.lustre
-       fi
 }
 
 #######