From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx1.redhat.com ([209.132.183.28]:51850 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752191AbdJaLeC (ORCPT ); Tue, 31 Oct 2017 07:34:02 -0400 Date: Tue, 31 Oct 2017 19:34:00 +0800 From: Eryu Guan Subject: Re: [PATCH] generic/4[13,62]: restore TEST mount options Message-ID: <20171031113400.GM17339@eguan.usersys.redhat.com> References: <20171030080831.7339-1-Omer.Zilberberg@netapp.com> <20171030203658.GA4094@dastard> <20171031043758.GF17339@eguan.usersys.redhat.com> <9513dd3d-22bf-0dde-6cfb-6d8f4bc9775c@netapp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <9513dd3d-22bf-0dde-6cfb-6d8f4bc9775c@netapp.com> Sender: fstests-owner@vger.kernel.org Content-Transfer-Encoding: quoted-printable To: Omer Zilberberg Cc: Dave Chinner , Omer Zilberberg , fstests@vger.kernel.org List-ID: On Tue, Oct 31, 2017 at 12:25:51PM +0200, Omer Zilberberg wrote: >=20 >=20 > On 10/31/2017 06:37 AM, 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, foll= owing > >>> tests using the TEST mount point may start with different mount opt= ions, > >>> 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=3Dfoo > >> $ echo $FOO > >> foo > >> $ bash > >> $ echo $FOO > >> foo > >> $ export FOO=3Dbar > >> $ 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 wi= th > > 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. > > > > MOUNT_OPTIONS=3D"-o dax" TEST_FS_MOUNT_OPTS=3D"" ./check generic/413 = generic/445 > > generic/445 mount TEST_DEV with "-o dax" too > > > > MOUNT_OPTIONS=3D"" TEST_FS_MOUNT_OPTS=3D"-o dax" ./check generic/413 = generic/445 > > generic/445 mount TEST_DEV without "-o dax" > > > > MOUNT_OPTIONS=3D"-o dax" TEST_FS_MOUNT_OPTS=3D"-o dax" ./check generi= c/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/ > > > > Omer, can you please confirm if you're hitting this issue? > I'm not 100% that's the case, so I better describe my settings more cle= arly: > I have a debug mount option on my system to recover the FS from a backu= p. > When that flag is set, umount writes everything to the backup. > Mount restores from it, overwriting everything. If you're testing with setting your debug mount option to both TEST_FS_MOUNT_OPTS and MOUNT_OPTIONS, and you still see the failure you were seeing, then that's a different problem. >=20 > As long as generic/413 is not involved, everything works well. > All _test_cycle_mount() calls first back everything up on umount, > then restore upon mount. So I get the same FS contents. >=20 > But, consider generic/118 running after generic/413: > - generic/413 finishes with a mount point with no mount options > - generic/118 begins with restored TEST_FS_MOUNT_OPTS, as you've pointe= d out. > - some writes are performed to the FS > - next _test_cycle_mount: > =C2=A0 calls umount w/o backing up (debug flag previously unset by gene= ric/413). Does this clear the backup too? If so, I suspect TEST_DEV got cleared on first mount with the debug option in generic/118, because the backup has been cleared in the _test_cycle_mount call in generic/413. > =C2=A0 calls mount WITH the debug flag, and recovers from an empty back= up, > =C2=A0 deleting the earlier writes. > - subsequent md5sum fails on "No such file or directory", as FS is now = empty. >=20 > > I think fixing _check__filesystem() is the correct way. And I gue= ss > > 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. > If indeed we're talking about the same problem, > please let me know if you'd like me to prepare a different patch. Sure, really appreciated if you can prepare a different patch, even if it's not the same problem :) Thanks, Eryu