From ef13d5464ec7c91c8479ef3e987732dc6355d5ee Mon Sep 17 00:00:00 2001 From: Artem Blagodarenko Date: Fri, 5 Jun 2020 11:45:45 -0400 Subject: [PATCH] LU-11915 tests: fix conf-sanity 115 test Not enough xattrs added to move outside inode. Add one additional xattr. The test works only with FLAKEY=false. Signed-off-by: Artem Blagodarenko Test-Parameters: testlist=conf-sanity env="ONLY=115" HPE-bug-id: LUS-6966 Change-Id: Iab13ed3434effb03e1209755ac51eba2debe7387 Reviewed-on: https://review.whamcloud.com/38849 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Petros Koutoupis Reviewed-by: Andrew Perepechko Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 8ae2476..d26cd21 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -15,7 +15,7 @@ init_logging ALWAYS_EXCEPT="$CONF_SANITY_EXCEPT 32newtarball" # bug number for skipped test: LU-11915 -ALWAYS_EXCEPT="$ALWAYS_EXCEPT 110 115" +ALWAYS_EXCEPT="$ALWAYS_EXCEPT 110" # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT! if $SHARED_KEY; then @@ -8522,20 +8522,21 @@ test_115() { echo "$dbfs_ver" | egrep -w "1.44.3.wc1|1.44.5.wc1|1.45.2.wc1" && skip_env "This version of debugfs doesn't show inode number" - is_dm_flakey_dev $SINGLEMDS $(mdsdevname 1) && - skip "This test can not be executed on flakey dev" - IMAGESIZE=$((3072 << 30)) # 3072 GiB stopall + local saved_flakey=${FLAKEY} + stack_trap "FLAKEY=$saved_flakey" EXIT + FLAKEY=false + echo "client1: " lctl dl mount | grep lustre echo "mds1: " - do_facet mds1 "hostname; ifconfig; lctl dl; mount" + do_facet mds1 "hostname; lctl dl; mount" echo "ost1: " - do_facet ost1 "hostname; ifconfig; lctl dl; mount" + do_facet ost1 "hostname; lctl dl; mount" # We need MDT size 3072GB, because it is smallest # partition that can store 2B inodes do_facet $SINGLEMDS "mkdir -p $TMP/$tdir" @@ -8562,21 +8563,23 @@ test_115() { mkdir -p $DIR/$tdir || error "mkdir $DIR/$tdir fail" goal="/sys/fs/ldiskfs/$(basename $mdsdev)/inode_goal" -echo goal: $goal + echo goal: $goal # 2147483648 is 0x80000000 do_facet $SINGLEMDS "echo 2147483648 >> $goal; grep . $goal" touch $DIR/$tdir/$tfile - # attrs from 1 to 15 go to block, 16th - to inode - for i in {1..16}; do + # attrs from 1 to 16 go to block, 17th - to inode + for i in {1..17}; do local nm="trusted.ea$i" setfattr -n $nm -v $(printf "xattr%0250d" $i) $DIR/$tdir/$tfile done + do_facet $SINGLEMDS $DEBUGFS -c -R "stat ROOT/$tdir/$tfile" $mdsdev + # inode <2147483649> trusted.ea16 (255) local inode_num=$(do_facet $SINGLEMDS \ "$DEBUGFS -c -R 'stat ROOT/$tdir/$tfile' $mdsdev" | - awk '/ea16/ { print $2 }' | + awk '/ea17/ { print $2 }' | sed -e 's/>//' -e 's/