Add a bunch of tests for remount code.

Written by Christoph and amended by Tim to do some more testing
with fstab etc.
Merge of master-melb:xfs-cmds:31909a by kenmcd.

  remount test

diff --git a/189 b/189
new file mode 100644 (file)
index 0000000..9452ef6
--- /dev/null
+++ b/189
@@ -0,0 +1,181 @@
+#! /bin/sh
+# FS QA Test No. 189
+#
+# Test remount behaviour
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.
+#-----------------------------------------------------------------------
+#
+# creator
+owner=hch@lst.de
+
+seq=`basename $0`
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1       # failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+tag="added by qa $seq"
+
+_cleanup()
+{
+       cd /
+       umount $SCRATCH_MNT 2>/dev/null
+       _putback_scratch_fstab
+       rm -f $tmp.*
+}
+
+_scratch_filter()
+{
+       sed -e "s#$SCRATCH_DEV#SCRATCH_DEV#" \
+           -e "s#$SCRATCH_MNT#SCRATCH_MNT#"
+}
+
+_check_mount()
+{
+       # assumes that we don't have extra ops in fstab
+       _mount | grep $SCRATCH_MNT | _scratch_filter
+}
+
+#
+# mount(8) adds all options from mtab and fstab to the mount command
+# line.  So the filesystem either must not reject any option at all
+# if it can't change it, or compare the value on the command line
+# to the existing state and only reject it if it would change
+# something that can't be changed.
+#
+# Test this behaviour by mounting a filesystem read-only with a non-
+# default option and then try to remount it rw.
+#
+# note that mount(8) doesn't add the options when specifying both the
+# device node and mount point, so test out the various mounting
+# alternatives
+#
+_test_remount_rw()
+{
+       # use filestreams as a hopefully never default option
+       echo
+       echo "try remount ro,filestreams -> rw,filestreams"
+       echo
+       _scratch_mount -o ro,filestreams
+       [ $? -eq 0 ] || echo "ro,filestreams mount failed unexpectedly"
+       _check_mount
+
+       for dev_mnt in $SCRATCH_DEV $SCRATCH_MNT "$SCRATCH_DEV $SCRATCH_MNT"; do
+               echo "mounting given: $dev_mnt" | _scratch_filter
+               _mount -o remount,rw $dev_mnt
+               [ $? -eq 0 ] || echo "remount rw failed"
+               _check_mount
+       done
+
+       umount $SCRATCH_MNT
+
+       echo
+       echo "try remount ro,noattr2 -> rw,attr2"
+       echo
+       _scratch_mount -o ro,noattr2
+       [ $? -eq 0 ] || echo "ro,noattr2 mount failed unexpectedly"
+       _check_mount
+
+       for dev_mnt in $SCRATCH_DEV $SCRATCH_MNT "$SCRATCH_DEV $SCRATCH_MNT"; do
+               echo "mounting given: $dev_mnt" | _scratch_filter
+               _mount -o remount,rw,attr2 $dev_mnt
+               [ $? -eq 0 ] || echo "remount rw,attr2 failed"
+               _check_mount
+       done
+
+       umount $SCRATCH_MNT
+}
+
+#
+# barrier is the only option we can change besides ro<->rw which is partially
+# handled by the VFS and tested elsewhere.  Make sure mount accepts going
+# from barrier (which also is the default) to nobarrier and back.
+#
+_test_remount_barrier()
+{
+       echo
+       echo "Do remount barrier tests"
+       echo
+
+       # mention barrier explicitly even if it's currently the default just to be sure
+       _scratch_mount -o barrier
+       [ $? -eq 0 ] || echo "mount failed unexpectedly!"
+       _check_mount
+
+       _scratch_mount -o remount,nobarrier
+       [ $? -eq 0 ] || _fail "remount nobarrier failed"
+       _check_mount
+
+       _scratch_mount -o remount,barrier
+       [ $? -eq 0 ] || _fail "remount barrier failed"
+       _check_mount
+
+       umount $SCRATCH_MNT
+}
+
+
+#
+# Example fstab entry
+# /dev/sdb2            /mnt/scratch1        xfs       defaults 0 0
+#
+_add_scratch_fstab()
+{
+       # comment out any existing SCRATCH_DEV
+       $SED_PROG -i "s;$SCRATCH_DEV;#$SCRATCH_DEV;" /etc/fstab
+
+       # add our fstab entry
+       echo "$SCRATCH_DEV $SCRATCH_MNT xfs defaults 0 0 # $tag" >> /etc/fstab
+}
+
+_modify_scratch_fstab()
+{
+       opts=$1
+
+       # modify our fstab entry that we added
+       # modify opts by looking for last word which has non-space chars
+       $SED_PROG -i "s; [^ ]* 0 0 # $tag; $opts 0 0 # $tag;" /etc/fstab
+}
+
+_putback_scratch_fstab()
+{
+       # uncomment out any existing SCRATCH_DEV
+       $SED_PROG -i "s;#$SCRATCH_DEV;$SCRATCH_DEV;" /etc/fstab
+
+       # remove the one we added at the end
+       $SED_PROG -i "/# $tag/d" /etc/fstab
+}
+
+# get standard environment, filters and checks
+. ./common.rc
+. ./common.filter
+
+# real QA test starts here
+_supported_fs xfs
+_supported_os Linux
+
+_need_to_be_root
+_require_scratch
+
+unset SCRATCH_OPTIONS
+unset MOUNT_OPTIONS
+
+_scratch_mkfs_xfs | _filter_mkfs 2>/dev/null
+
+_add_scratch_fstab
+_test_remount_rw
+
+echo
+echo "add noikeep to fstab for scratch"
+_modify_scratch_fstab noikeep # noikeep is not default for non dmapi
+_test_remount_rw
+
+_putback_scratch_fstab
+_test_remount_barrier
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0

diff --git a/189.out b/189.out
new file mode 100644 (file)
index 0000000..e572c78
--- /dev/null
+++ b/189.out
@@ -0,0 +1,56 @@
+QA output created by 189
+meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
+data     = bsize=XXX blocks=XXX, imaxpct=PCT
+         = sunit=XXX swidth=XXX, unwritten=X
+naming   =VERN bsize=XXX
+log      =LDEV bsize=XXX blocks=XXX
+realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
+
+try remount ro,filestreams -> rw,filestreams
+
+SCRATCH_DEV on SCRATCH_MNT type xfs (ro,filestreams)
+mounting given: SCRATCH_DEV
+SCRATCH_DEV on SCRATCH_MNT type xfs (rw)
+mounting given: SCRATCH_MNT
+SCRATCH_DEV on SCRATCH_MNT type xfs (rw)
+mounting given: SCRATCH_DEV SCRATCH_MNT
+SCRATCH_DEV on SCRATCH_MNT type xfs (rw)
+
+try remount ro,noattr2 -> rw,attr2
+
+SCRATCH_DEV on SCRATCH_MNT type xfs (ro,noattr2)
+mounting given: SCRATCH_DEV
+SCRATCH_DEV on SCRATCH_MNT type xfs (rw,attr2)
+mounting given: SCRATCH_MNT
+SCRATCH_DEV on SCRATCH_MNT type xfs (rw,attr2)
+mounting given: SCRATCH_DEV SCRATCH_MNT
+SCRATCH_DEV on SCRATCH_MNT type xfs (rw,attr2)
+
+add noikeep to fstab for scratch
+
+try remount ro,filestreams -> rw,filestreams
+
+SCRATCH_DEV on SCRATCH_MNT type xfs (ro,filestreams)
+mounting given: SCRATCH_DEV
+SCRATCH_DEV on SCRATCH_MNT type xfs (rw,noikeep)
+mounting given: SCRATCH_MNT
+SCRATCH_DEV on SCRATCH_MNT type xfs (rw,noikeep)
+mounting given: SCRATCH_DEV SCRATCH_MNT
+SCRATCH_DEV on SCRATCH_MNT type xfs (rw)
+
+try remount ro,noattr2 -> rw,attr2
+
+SCRATCH_DEV on SCRATCH_MNT type xfs (ro,noattr2)
+mounting given: SCRATCH_DEV
+SCRATCH_DEV on SCRATCH_MNT type xfs (rw,noikeep,attr2)
+mounting given: SCRATCH_MNT
+SCRATCH_DEV on SCRATCH_MNT type xfs (rw,noikeep,attr2)
+mounting given: SCRATCH_DEV SCRATCH_MNT
+SCRATCH_DEV on SCRATCH_MNT type xfs (rw,attr2)
+
+Do remount barrier tests
+
+SCRATCH_DEV on SCRATCH_MNT type xfs (rw,barrier)
+SCRATCH_DEV on SCRATCH_MNT type xfs (rw,nobarrier)
+SCRATCH_DEV on SCRATCH_MNT type xfs (rw,barrier)
+*** done

diff --git a/group b/group
index 4157bb08d518eb00f73c77e8d14c0e03a0907d0d..585cf6220012b6b5310343c5d2f93d9bb4e5805a 100644 (file)
--- a/group
+++ b/group
@@ -89,6 +89,9 @@ filestreams   dgc@sgi.com
 # case-insensitive based tests
 ci             bnaujok@sgi.com
 
+# test the mount/remount path
+mount          tes@sgi.com
+
 # test-group association ... one line per test
 #
 001 rw dir udf auto
@@ -279,3 +282,4 @@ ci          bnaujok@sgi.com
 186 attr auto
 187 attr auto
 188 ci dir auto
+189 mount auto