On Tue, Oct 31, 2017 at 12:37:58PM +0800, Eryu Guan wrote: > On Tue, Oct 31, 2017 at 07:36:58AM +1100, Dave Chinner wrote: > > On Mon, Oct 30, 2017 at 10:08:31AM +0200, Omer Zilberberg wrote: > > > These tests locally change the TEST_FS_MOUNT_OPTS/MOUNT_OPTIONS > > > environment variables, and run _test_cycle_mount. As a result, following > > > tests using the TEST mount point may start with different mount options, > > > depending on run order. > > > > I don't think that's the case. The change of the environment > > variable should only affect the current test process and it's > > children. When the test exits, we go back to the environment of the > > check process, where the TEST_FS_MOUNT_OPTS environment variable is > > still correctly set, and all future tests inherit from that. i.e.: > > > > $ export FOO=foo > > $ echo $FOO > > foo > > $ bash > > $ echo $FOO > > foo > > $ export FOO=bar > > $ echo $FOO > > bar > > $ exit > > $ echo $FOO > > foo > > $ > > > > And after each test, check runs _check_filesystems(), which cycles > > the test mount, so for each new test process that is run they should > > already start in the correct state... > > I agreed, the changing of variables in a sub-shell won't affect the > parent's copy, and check will restore the mounts with the untouched > options. > > But the problem is that _check_test_fs() will cycle mount TEST_DEV with > MOUNT_OPTIONS not TEST_FS_MOUNT_OPTS, so if you have different mount > options set for TEST_DEV and SCRATCH_DEV, you'll see mount options > changed for TEST_DEV. e.g. That's a bug in _check_test_fs() that needs fixing. > MOUNT_OPTIONS="-o dax" TEST_FS_MOUNT_OPTS="" ./check generic/413 generic/445 > generic/445 mount TEST_DEV with "-o dax" too > > MOUNT_OPTIONS="" TEST_FS_MOUNT_OPTS="-o dax" ./check generic/413 generic/445 > generic/445 mount TEST_DEV without "-o dax" > > MOUNT_OPTIONS="-o dax" TEST_FS_MOUNT_OPTS="-o dax" ./check generic/413 generic/445 > both tests and both devices mount with "-o dax" > > That's been discussed in this thread: > https://patchwork.kernel.org/patch/9742039/ Ok, so it definitely needs fixing - using MOUNT_OPTIONS with the test device is just simply wrong. > I think fixing _check_<fs>_filesystem() is the correct way. And I guess > we can refactor out a common function and call it in > _check_[xfs|btrfs|generic]_filesystem, pass the correct mount options > based on what device we're working on. check_xfs_filesystem already takes a mount option parameter. The problem is that it's considered "extra" and appended to MOUNT_OPTIONS. Should be simple to fix... Cheers, Dave. -- Dave Chinner david@xxxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
