From 34f94efa4847ebd84b2fa42b7a0fc85bd7f6f8e3 Mon Sep 17 00:00:00 2001 From: Ashish Purkar Date: Fri, 3 Jul 2015 17:54:47 +0530 Subject: [PATCH] LU-4340 tests: Fix test_69 of conf-sanity test Since 100% inodes were used with default value of MDSSIZE and OSTSIZE, test_69 of conf-sanity test was failing with ENOSPC error. Use decreased value of num_create to create 20000*3 files. Also added umount of client before OST replace operation so that eviction/recovery of client is not seen. Seagate-bug-id: MRP-1698 Signed-off-by: Ashish Purkar Change-Id: I4568cfb3d259ae248f26d5463cd3291db60f2d5b Reviewed-on: http://review.whamcloud.com/15487 Tested-by: Jenkins Reviewed-by: Andreas Dilger Tested-by: Maloo Reviewed-by: Jian Yu Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index d33ea40..1100c02 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -4270,15 +4270,13 @@ test_69() { # use OST0000 since it probably has the most creations local OSTNAME=$(ostname_from_index 0) local mdtosc_proc1=$(get_mdtosc_proc_path mds1 $OSTNAME) - local last_id=$(do_facet mds1 $LCTL get_param -n \ - osc.$mdtosc_proc1.prealloc_last_id) # Want to have OST LAST_ID over 1.5 * OST_MAX_PRECREATE to # verify that the LAST_ID recovery is working properly. If # not, then the OST will refuse to allow the MDS connect # because the LAST_ID value is too different from the MDS #define OST_MAX_PRECREATE=20000 - local num_create=$((20000 * 5)) + local num_create=$((20000 * 3)) mkdir $DIR/$tdir || error "mkdir $DIR/$tdir failed" $SETSTRIPE -i 0 $DIR/$tdir || error "$SETSTRIPE -i 0 $DIR/$tdir failed" @@ -4288,6 +4286,7 @@ test_69() { # filesystem is not inconsistent later on $LFS find $MOUNT --ost 0 | xargs rm + umount_client $MOUNT || error "umount client failed" stop_ost || error "OST0 stop failure" add ost1 $(mkfs_opts ost1 $(ostdevname 1)) --reformat --replace \ $(ostdevname 1) $(ostvdevname 1) || @@ -4295,6 +4294,7 @@ test_69() { start_ost || error "OST0 restart failure" wait_osc_import_state mds ost FULL + mount_client $MOUNT || error "mount client failed" touch $DIR/$tdir/$tfile-last || error "create file after reformat" local idx=$($GETSTRIPE -i $DIR/$tdir/$tfile-last) [ $idx -ne 0 ] && error "$DIR/$tdir/$tfile-last on $idx not 0" || true -- 1.8.3.1