From: yang xu Date: Fri, 1 Dec 2017 10:05:36 +0000 (+0800) Subject: generic/459: Fix check for ro-remount in extN X-Git-Tag: v2022.05.01~1748 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bfef1cdccf6b399b01b3818784a61594249d2b73;p=users%2Fhch%2Fxfstests-dev.git generic/459: Fix check for ro-remount in extN Currently ,freeze failure caused by the lack of space can not guarantee to remount extN filesystem in read-only mode, and test failed due to "ro" mount option not found. We can add a touch to trigger the action which aborts journal and ro-remounts the fs. [eguan: update commit log and comments a bit] Signed-off-by: yang xu Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- diff --git a/tests/generic/459 b/tests/generic/459 index eb05fb80e..e755cf7f1 100755 --- a/tests/generic/459 +++ b/tests/generic/459 @@ -125,16 +125,19 @@ $LVM_PROG lvextend -L $newpsize $vgname/$poolname >>$seqres.full 2>&1 wait $freezeid ret=$? - # Different filesystems will handle the lack of real space in different ways, # some will remount the filesystem in read-only mode, some will not. These tests # will check if: # - The filesystem turns into Read-Only and reject further writes # - The filesystem stays in Read-Write mode, but can be frozen/thawed # without getting stuck. -ISRO=$(_fs_options /dev/mapper/$vgname-$snapname | grep -w "ro") - if [ $ret -ne 0 ]; then + # fsfreeze failed, filesystem should reject further writes and remount + # as readonly. Sometimes the previous write process won't trigger + # ro-remount, e.g. on ext3/4, do additional touch here to make sure + # filesystems see the metadata I/O error. + touch $SCRATCH_MNT/newfile >/dev/null 2>&1 + ISRO=$(_fs_options /dev/mapper/$vgname-$snapname | grep -w "ro") if [ -n "$ISRO" ]; then echo "Test OK" else