* [PATCH] common: enable tests that require scratch device on CIFS
@ 2014-11-10 10:59 Eryu Guan
2014-11-10 15:32 ` Steve French
0 siblings, 1 reply; 9+ messages in thread
From: Eryu Guan @ 2014-11-10 10:59 UTC (permalink / raw)
To: fstests; +Cc: linux-cifs, Eryu Guan
Just like commit
76c5f3c common: re-enable tests that require scratch dev on NFS
Enable tests that require scratch device on CIFS too to get a better
test coverage.
Signed-off-by: Eryu Guan <eguan@redhat.com>
---
Tested with samba server on localhost, the results are
Ran: generic/001 generic/002 generic/005 generic/006 generic/007 generic/010 generic/011 generic/013 generic/014 generic/023 generic/024 generic/028 generic/029 generic/035 generic/036 generic/053 generic/069 generic/074 generic/075 generic/088 generic/089 generic/091 generic/100 generic/105 generic/112 generic/113 generic/120 generic/123 generic/124 generic/125 generic/126 generic/127 generic/128 generic/129 generic/130 generic/131 generic/132 generic/133 generic/135 generic/141 generic/169 generic/184 generic/192 generic/193 generic/198 generic/207 generic/208 generic/209 generic/210 generic/211 generic/212 generic/215 generic/221 generic/236 generic/237 generic/239 generic/241 generic/245 generic/246 generic/247 generic/248 generic/249 generic/257 generic/258 generic/263 generic/285 generic/286 generic/294 generic/306 generic/307 generic/308 generic/309 generic/310 generic/313 generic/314 generic/315 generic/317 generic/318 generic/319 generic/323
Not run: generic/003 generic/004 generic/008 generic/009 generic/012 generic/015 generic/016 generic/017 generic/018 generic/019 generic/020 generic/021 generic/022 generic/025 generic/026 generic/027 generic/030 generic/031 generic/032 generic/033 generic/034 generic/037 generic/062 generic/068 generic/070 generic/076 generic/077 generic/079 generic/083 generic/093 generic/097 generic/099 generic/117 generic/204 generic/213 generic/214 generic/219 generic/223 generic/224 generic/225 generic/226 generic/228 generic/230 generic/231 generic/232 generic/233 generic/234 generic/235 generic/240 generic/251 generic/255 generic/256 generic/260 generic/269 generic/270 generic/273 generic/274 generic/275 generic/277 generic/280 generic/288 generic/299 generic/300 generic/311 generic/312 generic/316 generic/320 generic/321 generic/322 generic/324 generic/325 shared/006 shared/032 shared/051 shared/272 shared/289 shared/298
Failures: generic/035 generic/074 generic/120 generic/184 generic/192 generic/193 generic/215 generic/237 generic/258 generic/294 generic/306 generic/307 generic/313 generic/317 generic/319
Failed 15 of 80 tests
I haven't looked into the failures and filtered out unnecessary failures yet.
common/rc | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/common/rc b/common/rc
index d5e3aff..435f74f 100644
--- a/common/rc
+++ b/common/rc
@@ -571,7 +571,9 @@ _scratch_mkfs()
_scratch_cleanup_files
;;
cifs)
- # do nothing for cifs
+ # unable to re-create CIFS, just remove all files in $SCRATCH_MNT to
+ # avoid EEXIST caused by the leftover files created in previous runs
+ _scratch_cleanup_files
;;
udf)
$MKFS_UDF_PROG $MKFS_OPTIONS $* $SCRATCH_DEV > /dev/null
@@ -1053,7 +1055,13 @@ _require_scratch_nocheck()
fi
;;
cifs)
- _notrun "requires a scratch device"
+ echo $SCRATCH_DEV | grep -q "//" > /dev/null 2>&1
+ if [ -z "$SCRATCH_DEV" -o "$?" != "0" ]; then
+ _notrun "this test requires a valid \$SCRATCH_DEV"
+ fi
+ if [ ! -d "$SCRATCH_MNT" ]; then
+ _notrun "this test requires a valid \$SCRATCH_MNT"
+ fi
;;
tmpfs)
if [ -z "$SCRATCH_DEV" -o ! -d "$SCRATCH_MNT" ];
--
1.8.3.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] common: enable tests that require scratch device on CIFS
2014-11-10 10:59 [PATCH] common: enable tests that require scratch device on CIFS Eryu Guan
@ 2014-11-10 15:32 ` Steve French
2014-11-10 16:03 ` Eryu Guan
0 siblings, 1 reply; 9+ messages in thread
From: Steve French @ 2014-11-10 15:32 UTC (permalink / raw)
To: Eryu Guan; +Cc: fstests, linux-cifs@vger.kernel.org
Failures: generic/035 generic/074 generic/120 generic/184 generic/192
generic/193 generic/215 generic/237 generic/258 generic/294
generic/306 generic/307 generic/313 generic/317 generic/319
Test 258 is a Samba server bug (and does work to Windows server). 074
and 215 are passing for me for both CIFS and SMB3, 035 was only
failing for SMB2/SMB3 (and NFS) for me, not CIFS
Test 184 passes to Samba, but requires "sfu" (mount.cifs mount option)
if mounting with SMB2/SMB3 or mounting to Windows (in order to emulate
FIFO and device files)
192 and 193 and 313 are time stamp related problems.
Are you using at least 3.17 kernel? We put various fixes in 3.17 to
address problems fsx pointed out.
On Mon, Nov 10, 2014 at 4:59 AM, Eryu Guan <eguan@redhat.com> wrote:
> Just like commit
>
> 76c5f3c common: re-enable tests that require scratch dev on NFS
>
> Enable tests that require scratch device on CIFS too to get a better
> test coverage.
>
> Signed-off-by: Eryu Guan <eguan@redhat.com>
> ---
>
> Tested with samba server on localhost, the results are
>
> Ran: generic/001 generic/002 generic/005 generic/006 generic/007 generic/010 generic/011 generic/013 generic/014 generic/023 generic/024 generic/028 generic/029 generic/035 generic/036 generic/053 generic/069 generic/074 generic/075 generic/088 generic/089 generic/091 generic/100 generic/105 generic/112 generic/113 generic/120 generic/123 generic/124 generic/125 generic/126 generic/127 generic/128 generic/129 generic/130 generic/131 generic/132 generic/133 generic/135 generic/141 generic/169 generic/184 generic/192 generic/193 generic/198 generic/207 generic/208 generic/209 generic/210 generic/211 generic/212 generic/215 generic/221 generic/236 generic/237 generic/239 generic/241 generic/245 generic/246 generic/247 generic/248 generic/249 generic/257 generic/258 generic/263 generic/285 generic/286 generic/294 generic/306 generic/307 generic/308 generic/309 generic/310 generic/313 generic/314 generic/315 generic/317 generic/318 generic/319 generic/323
>
> Not run: generic/003 generic/004 generic/008 generic/009 generic/012 generic/015 generic/016 generic/017 generic/018 generic/019 generic/020 generic/021 generic/022 generic/025 generic/026 generic/027 generic/030 generic/031 generic/032 generic/033 generic/034 generic/037 generic/062 generic/068 generic/070 generic/076 generic/077 generic/079 generic/083 generic/093 generic/097 generic/099 generic/117 generic/204 generic/213 generic/214 generic/219 generic/223 generic/224 generic/225 generic/226 generic/228 generic/230 generic/231 generic/232 generic/233 generic/234 generic/235 generic/240 generic/251 generic/255 generic/256 generic/260 generic/269 generic/270 generic/273 generic/274 generic/275 generic/277 generic/280 generic/288 generic/299 generic/300 generic/311 generic/312 generic/316 generic/320 generic/321 generic/322 generic/324 generic/325 shared/006 shared/032 shared/051 shared/272 shared/289 shared/298
>
> Failures: generic/035 generic/074 generic/120 generic/184 generic/192 generic/193 generic/215 generic/237 generic/258 generic/294 generic/306 generic/307 generic/313 generic/317 generic/319
>
> Failed 15 of 80 tests
>
> I haven't looked into the failures and filtered out unnecessary failures yet.
>
> common/rc | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/common/rc b/common/rc
> index d5e3aff..435f74f 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -571,7 +571,9 @@ _scratch_mkfs()
> _scratch_cleanup_files
> ;;
> cifs)
> - # do nothing for cifs
> + # unable to re-create CIFS, just remove all files in $SCRATCH_MNT to
> + # avoid EEXIST caused by the leftover files created in previous runs
> + _scratch_cleanup_files
> ;;
> udf)
> $MKFS_UDF_PROG $MKFS_OPTIONS $* $SCRATCH_DEV > /dev/null
> @@ -1053,7 +1055,13 @@ _require_scratch_nocheck()
> fi
> ;;
> cifs)
> - _notrun "requires a scratch device"
> + echo $SCRATCH_DEV | grep -q "//" > /dev/null 2>&1
> + if [ -z "$SCRATCH_DEV" -o "$?" != "0" ]; then
> + _notrun "this test requires a valid \$SCRATCH_DEV"
> + fi
> + if [ ! -d "$SCRATCH_MNT" ]; then
> + _notrun "this test requires a valid \$SCRATCH_MNT"
> + fi
> ;;
> tmpfs)
> if [ -z "$SCRATCH_DEV" -o ! -d "$SCRATCH_MNT" ];
> --
> 1.8.3.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] common: enable tests that require scratch device on CIFS
2014-11-10 15:32 ` Steve French
@ 2014-11-10 16:03 ` Eryu Guan
2014-11-12 23:26 ` Steve French
0 siblings, 1 reply; 9+ messages in thread
From: Eryu Guan @ 2014-11-10 16:03 UTC (permalink / raw)
To: Steve French; +Cc: fstests, linux-cifs@vger.kernel.org
On Mon, Nov 10, 2014 at 09:32:34AM -0600, Steve French wrote:
> Failures: generic/035 generic/074 generic/120 generic/184 generic/192
> generic/193 generic/215 generic/237 generic/258 generic/294
> generic/306 generic/307 generic/313 generic/317 generic/319
>
> Test 258 is a Samba server bug (and does work to Windows server). 074
> and 215 are passing for me for both CIFS and SMB3, 035 was only
> failing for SMB2/SMB3 (and NFS) for me, not CIFS
generic/074 is passing for me too now.
generic/215 fails like:
--- tests/generic/215.out 2013-10-19 01:23:10.352848003 +0800
+++ /root/xfstests/results//generic/215.out.bad 2014-11-10 23:59:41.619045914 +0800
@@ -5,4 +5,6 @@
4096+0 records out
writing via mmap
+FAIL: mtime not update after mapped write
+FAIL: ctime not update after mapped write
*** done
> Test 184 passes to Samba, but requires "sfu" (mount.cifs mount option)
> if mounting with SMB2/SMB3 or mounting to Windows (in order to emulate
> FIFO and device files)
>
> 192 and 193 and 313 are time stamp related problems.
>
> Are you using at least 3.17 kernel? We put various fixes in 3.17 to
> address problems fsx pointed out.
Yes, I'm using 3.18-rc2+ kernel.
Thanks,
Eryu
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] common: enable tests that require scratch device on CIFS
2014-11-10 16:03 ` Eryu Guan
@ 2014-11-12 23:26 ` Steve French
2014-11-13 3:28 ` Dave Chinner
0 siblings, 1 reply; 9+ messages in thread
From: Steve French @ 2014-11-12 23:26 UTC (permalink / raw)
To: Eryu Guan; +Cc: fstests, linux-cifs@vger.kernel.org
I get newly enabled test 294 passing on cifs mounts to Samba.
What is best way to get the mount options passed to the mount of
scratch dev so it doesn't prompt for it?
(seems to ignore the mount options in TEST_FS_MOUNT_OPTS so prompts
multiple times for password of scratch mount)
On Mon, Nov 10, 2014 at 10:03 AM, Eryu Guan <eguan@redhat.com> wrote:
> On Mon, Nov 10, 2014 at 09:32:34AM -0600, Steve French wrote:
>> Failures: generic/035 generic/074 generic/120 generic/184 generic/192
>> generic/193 generic/215 generic/237 generic/258 generic/294
>> generic/306 generic/307 generic/313 generic/317 generic/319
>>
>> Test 258 is a Samba server bug (and does work to Windows server). 074
>> and 215 are passing for me for both CIFS and SMB3, 035 was only
>> failing for SMB2/SMB3 (and NFS) for me, not CIFS
>
> generic/074 is passing for me too now.
>
> generic/215 fails like:
> --- tests/generic/215.out 2013-10-19 01:23:10.352848003 +0800
> +++ /root/xfstests/results//generic/215.out.bad 2014-11-10 23:59:41.619045914 +0800
> @@ -5,4 +5,6 @@
> 4096+0 records out
>
> writing via mmap
> +FAIL: mtime not update after mapped write
> +FAIL: ctime not update after mapped write
> *** done
>
>> Test 184 passes to Samba, but requires "sfu" (mount.cifs mount option)
>> if mounting with SMB2/SMB3 or mounting to Windows (in order to emulate
>> FIFO and device files)
>>
>> 192 and 193 and 313 are time stamp related problems.
>>
>> Are you using at least 3.17 kernel? We put various fixes in 3.17 to
>> address problems fsx pointed out.
>
> Yes, I'm using 3.18-rc2+ kernel.
>
> Thanks,
> Eryu
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] common: enable tests that require scratch device on CIFS
2014-11-12 23:26 ` Steve French
@ 2014-11-13 3:28 ` Dave Chinner
2014-11-13 4:08 ` Steve French
0 siblings, 1 reply; 9+ messages in thread
From: Dave Chinner @ 2014-11-13 3:28 UTC (permalink / raw)
To: Steve French; +Cc: Eryu Guan, fstests, linux-cifs@vger.kernel.org
[ please don't top post. ]
On Wed, Nov 12, 2014 at 05:26:13PM -0600, Steve French wrote:
> I get newly enabled test 294 passing on cifs mounts to Samba.
>
> What is best way to get the mount options passed to the mount of
> scratch dev so it doesn't prompt for it?
# MOUNT_OPTIONS="-o ...." ./check -g auto
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] common: enable tests that require scratch device on CIFS
2014-11-13 3:28 ` Dave Chinner
@ 2014-11-13 4:08 ` Steve French
2014-11-13 4:27 ` Dave Chinner
0 siblings, 1 reply; 9+ messages in thread
From: Steve French @ 2014-11-13 4:08 UTC (permalink / raw)
To: Dave Chinner; +Cc: Eryu Guan, fstests, linux-cifs@vger.kernel.org
On Wed, Nov 12, 2014 at 9:28 PM, Dave Chinner <david@fromorbit.com> wrote:
> On Wed, Nov 12, 2014 at 05:26:13PM -0600, Steve French wrote:
>> I get newly enabled test 294 passing on cifs mounts to Samba.
>>
>> What is best way to get the mount options passed to the mount of
>> scratch dev so it doesn't prompt for it?
>
> # MOUNT_OPTIONS="-o ...." ./check -g auto
much better - that worked - thanks
I had been using TEST_FS_MOUNT_OPTS (so I could have multiple sections
in local.config) rather
than MOUNT_OPTIONS
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] common: enable tests that require scratch device on CIFS
2014-11-13 4:08 ` Steve French
@ 2014-11-13 4:27 ` Dave Chinner
2014-11-13 4:40 ` Steve French
0 siblings, 1 reply; 9+ messages in thread
From: Dave Chinner @ 2014-11-13 4:27 UTC (permalink / raw)
To: Steve French; +Cc: Eryu Guan, fstests, linux-cifs@vger.kernel.org
On Wed, Nov 12, 2014 at 10:08:34PM -0600, Steve French wrote:
> On Wed, Nov 12, 2014 at 9:28 PM, Dave Chinner <david@fromorbit.com> wrote:
> > On Wed, Nov 12, 2014 at 05:26:13PM -0600, Steve French wrote:
> >> I get newly enabled test 294 passing on cifs mounts to Samba.
> >>
> >> What is best way to get the mount options passed to the mount of
> >> scratch dev so it doesn't prompt for it?
> >
> > # MOUNT_OPTIONS="-o ...." ./check -g auto
>
> much better - that worked - thanks
>
> I had been using TEST_FS_MOUNT_OPTS (so I could have multiple sections
> in local.config) rather
> than MOUNT_OPTIONS
BTW, why aren't you using CIFS_MOUNT_OPTIONS to define the login
creds for both the test and scratch devices? That's what it was
added for....
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] common: enable tests that require scratch device on CIFS
2014-11-13 4:27 ` Dave Chinner
@ 2014-11-13 4:40 ` Steve French
2014-11-13 4:58 ` Dave Chinner
0 siblings, 1 reply; 9+ messages in thread
From: Steve French @ 2014-11-13 4:40 UTC (permalink / raw)
To: Dave Chinner; +Cc: Eryu Guan, fstests, linux-cifs@vger.kernel.org
On Wed, Nov 12, 2014 at 10:27 PM, Dave Chinner <david@fromorbit.com> wrote:
> On Wed, Nov 12, 2014 at 10:08:34PM -0600, Steve French wrote:
>> On Wed, Nov 12, 2014 at 9:28 PM, Dave Chinner <david@fromorbit.com> wrote:
>> > On Wed, Nov 12, 2014 at 05:26:13PM -0600, Steve French wrote:
>> >> I get newly enabled test 294 passing on cifs mounts to Samba.
>> >>
>> >> What is best way to get the mount options passed to the mount of
>> >> scratch dev so it doesn't prompt for it?
>> >
>> > # MOUNT_OPTIONS="-o ...." ./check -g auto
>>
>> much better - that worked - thanks
>>
>> I had been using TEST_FS_MOUNT_OPTS (so I could have multiple sections
>> in local.config) rather
>> than MOUNT_OPTIONS
>
> BTW, why aren't you using CIFS_MOUNT_OPTIONS to define the login
> creds for both the test and scratch devices? That's what it was
> added for....
When specifying multiple sections in local.config (a common case for us
is to have one section to run tests with cifs dialect, then run again with
smb2, then again with smb3 dialect etc.). Pavel had indicated that to do this
you must use TEST_FS_MOUNT_OPTS instead of CIFS_MOUNT_OPTIONS
if you have multiple sections. I haven't found a way around this.
Specifying the username/password in TEST_FS_MOUNT_OPTS does
work for the TEST mount but not for the SCRATCH mount (but as you
mentioned does work if you specify MOUNT_OPTIONS)
--
Thanks,
Steve
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] common: enable tests that require scratch device on CIFS
2014-11-13 4:40 ` Steve French
@ 2014-11-13 4:58 ` Dave Chinner
0 siblings, 0 replies; 9+ messages in thread
From: Dave Chinner @ 2014-11-13 4:58 UTC (permalink / raw)
To: Steve French; +Cc: Eryu Guan, fstests, linux-cifs@vger.kernel.org
On Wed, Nov 12, 2014 at 10:40:35PM -0600, Steve French wrote:
> On Wed, Nov 12, 2014 at 10:27 PM, Dave Chinner <david@fromorbit.com> wrote:
> > On Wed, Nov 12, 2014 at 10:08:34PM -0600, Steve French wrote:
> >> On Wed, Nov 12, 2014 at 9:28 PM, Dave Chinner <david@fromorbit.com> wrote:
> >> > On Wed, Nov 12, 2014 at 05:26:13PM -0600, Steve French wrote:
> >> >> I get newly enabled test 294 passing on cifs mounts to Samba.
> >> >>
> >> >> What is best way to get the mount options passed to the mount of
> >> >> scratch dev so it doesn't prompt for it?
> >> >
> >> > # MOUNT_OPTIONS="-o ...." ./check -g auto
> >>
> >> much better - that worked - thanks
> >>
> >> I had been using TEST_FS_MOUNT_OPTS (so I could have multiple sections
> >> in local.config) rather
> >> than MOUNT_OPTIONS
> >
> > BTW, why aren't you using CIFS_MOUNT_OPTIONS to define the login
> > creds for both the test and scratch devices? That's what it was
> > added for....
>
> When specifying multiple sections in local.config (a common case for us
> is to have one section to run tests with cifs dialect, then run again with
> smb2, then again with smb3 dialect etc.). Pavel had indicated that to do this
> you must use TEST_FS_MOUNT_OPTS instead of CIFS_MOUNT_OPTIONS
> if you have multiple sections. I haven't found a way around this.
Adding CIFS_MOUNT_OPTIONS in each section that requires a
different definition should just work. If it doesn't, then please
fix get_next_config() so it does and post the patch....
-Dave.
--
Dave Chinner
david@fromorbit.com
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2014-11-13 4:58 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-10 10:59 [PATCH] common: enable tests that require scratch device on CIFS Eryu Guan
2014-11-10 15:32 ` Steve French
2014-11-10 16:03 ` Eryu Guan
2014-11-12 23:26 ` Steve French
2014-11-13 3:28 ` Dave Chinner
2014-11-13 4:08 ` Steve French
2014-11-13 4:27 ` Dave Chinner
2014-11-13 4:40 ` Steve French
2014-11-13 4:58 ` Dave Chinner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox