LU-4444 tests: Skip conf-sanity/69 on zfs

Because file creates happen slowly on ZFS and the number of files
required to run the test is 100K, this test cannot run in a
reasonable amount of time.

Also bail out of test if createmany fails (possible if MDS or OST is
too small), this prevents the test from just timing out instead.

Test-Parameters: envdefinitions=SLOW=yes testlist=conf-sanity
Test-Parameters: envdefinitions=SLOW=yes testlist=conf-sanity mdsfilesystemtype=zfs mdtfilesystemtype=zfs ostfilesystemtype=zfs
Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Change-Id: Ic8286c970332e0c53525e4d89e4c5f0e32cf57cb
Reviewed-on: http://review.whamcloud.com/8841
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Jenkins
Reviewed-by: Jian Yu <jian.yu@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index c91c1d7..1f00d34 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -75,8 +75,8 @@ if [[ "$LDISKFS_MKFS_OPTS" != *lazy_itable_init* ]]; then
 fi
 
 [ $(facet_fstype $SINGLEMDS) = "zfs" ] &&
 fi
 
 [ $(facet_fstype $SINGLEMDS) = "zfs" ] &&

-# bug number for skipped test:        LU-2778 LU-2059
-       ALWAYS_EXCEPT="$ALWAYS_EXCEPT 57b     50h"
+# bug number for skipped test:        LU-2778 LU-2059 LU-4444
+       ALWAYS_EXCEPT="$ALWAYS_EXCEPT 57b     50h     69"

 
 init_logging
 
 
 init_logging
 


@@ -3979,7 +3979,8 @@ test_69() {
 
        mkdir -p $DIR/$tdir
        $LFS setstripe -i 0 $DIR/$tdir
 
        mkdir -p $DIR/$tdir
        $LFS setstripe -i 0 $DIR/$tdir

-       createmany -o $DIR/$tdir/$tfile- $num_create
+       createmany -o $DIR/$tdir/$tfile- $num_create ||
+               error "createmany: failed to create $num_create files: $?"

        # delete all of the files with objects on OST0 so the
        # filesystem is not inconsistent later on
        $LFS find $MOUNT --ost 0 | xargs rm
        # delete all of the files with objects on OST0 so the
        # filesystem is not inconsistent later on
        $LFS find $MOUNT --ost 0 | xargs rm