From: Oleg Drokin <oleg.drokin@intel.com>
Date: Tue, 1 Jul 2014 03:52:55 +0000 (+0000)
Subject: Revert "LU-1538 tests: keep /sbin/mount.lustre until cleanup"
X-Git-Tag: 2.6.0-RC1~30
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=41b9a48c344fb0822b2c956162b5d262f267b3a1

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

This change totally breaks my testing complaining about /sbin/mount.lustre being on a readonly filesystem.

This reverts commit 2ade2c4e1481c4bacf49e871cbd299cfc2ccc3b3.

Change-Id: Id8292f7e6328caca540808ab42f885289229f96b
Reviewed-on: http://review.whamcloud.com/10911
Tested-by: Jenkins
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Tested-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 8401a76..d725f620 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -620,7 +620,7 @@ test_17m() {
 	stop mds${mds_index}
 	do_facet mds${mds_index} $cmd || rc=$?
 
-	start mds${mds_index} $devname $MDS_MOUNT_OPTS || error "start failed"
+	start mds${mds_index} $devname $MDS_MOUNT_OPTS
 	df $MOUNT > /dev/null 2>&1
 	[ $rc -ne 0 ] && error "e2fsck should not report error upon "\
 		"short/long symlink MDT: rc=$rc"
@@ -645,8 +645,7 @@ check_fs_consistency_17n() {
 		stop mds${mdt_index}
 		do_facet mds${mdt_index} $cmd || rc=$?
 
-		start mds${mdt_index} $devname $MDS_MOUNT_OPTS ||
-			error "mount mds${mdt_index} failed"
+		start mds${mdt_index} $devname $MDS_MOUNT_OPTS
 		df $MOUNT > /dev/null 2>&1
 		[ $rc -ne 0 ] && break
 	done
@@ -723,8 +722,7 @@ test_17o() {
 
 	touch $WDIR/$tfile
 	stop mds${mdt_index}
-	start mds${mdt_index} $mdtdevname $MDS_MOUNT_OPTS ||
-		error "mount mds${mdt_index} failed"
+	start mds${mdt_index} $mdtdevname $MDS_MOUNT_OPTS
 
 	#define OBD_FAIL_OSD_LMA_INCOMPAT 0x194
 	do_facet mds${mdt_index} lctl set_param fail_loc=0x194
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 0bd6a22..8db4200 100755
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -539,25 +539,15 @@ 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
-		local sbin_mount=/sbin/mount.lustre
-		if grep -qe "$sbin_mount " /proc/mounts; then
-			cmp $mount_lustre $sbin_mount || umount $sbin_mount
+	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
 		fi
-		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
+		if ! grep -qe "/sbin/mount\.lustre " /proc/mounts; then
+			[ ! -f /sbin/mount.lustre ] && touch /sbin/mount.lustre
+			mount --bind $MOUNT_LUSTRE /sbin/mount.lustre
 		fi
 	fi
 }
@@ -603,17 +593,16 @@ unload_modules() {
 		fi
 	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
+    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
 
-	check_mem_leak || return 254
+    check_mem_leak || return 254
 
-	echo "modules unloaded."
-	return 0
+    echo "modules unloaded."
+    return 0
 }
 
 fs_log_size() {
@@ -4120,6 +4109,10 @@ 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
 }
 
 #######