X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=c70457c097c7c680c3c2522a9ee81a99f5717e4a;hp=4dc8ecdc82a3d88482907fe36064ad76eccc2465;hb=558a3a4a060fc4eaeff8c86c3719e2f4a047a07d;hpb=31832fab6d6da74e627133139b0c59c1dc07e62c

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 4dc8ecd..c70457c 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -58,11 +58,11 @@ init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/${NAME}.sh}
 init_logging
 
-[ "$SLOW" = "no" ] && EXCEPT_SLOW="24o 27m 64b 68 71 77f 78 115 124b 230d"
+[ "$SLOW" = "no" ] && EXCEPT_SLOW="24o 24D 27m 64b 68 71 77f 78 115 124b 230d"
 
 if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then
-	# bug number for skipped test: LU-1593 LU-2833 LU-1957 LU-2805
-	ALWAYS_EXCEPT="$ALWAYS_EXCEPT  34h     48a     180     184c"
+	# bug number for skipped test: LU-1593	LU-4536 LU-5242	LU-1957	LU-2805
+	ALWAYS_EXCEPT="$ALWAYS_EXCEPT  34h	65ic	132	180	184c"
 	[ "$SLOW" = "no" ] && EXCEPT_SLOW="$EXCEPT_SLOW 51b 51ba"
 fi
 
@@ -1251,6 +1251,23 @@ test_24C() {
 }
 run_test 24C "check .. in striped dir"
 
+test_24D() { # LU-6101
+	local NFILES=50000
+
+	rm -rf $DIR/$tdir
+	mkdir -p $DIR/$tdir
+	createmany -m $DIR/$tdir/$tfile $NFILES
+	local t=$(ls $DIR/$tdir | wc -l)
+	local u=$(ls $DIR/$tdir | sort -u | wc -l)
+	local v=$(ls -ai $DIR/$tdir | sort -u | wc -l)
+	if [ $t -ne $NFILES -o $u -ne $NFILES -o $v -ne $((NFILES + 2)) ] ; then
+		error "Expected $NFILES files, got $t ($u unique $v .&..)"
+	fi
+
+	rm -rf $DIR/$tdir || error "Can not delete directories"
+}
+run_test 24D "readdir() returns correct number of entries after cursor reload"
+
 test_25a() {
 	echo '== symlink sanity ============================================='
 
@@ -1464,34 +1481,33 @@ exhaust_precreations() {
 	local OSTIDX=$1
 	local FAILLOC=$2
 	local FAILIDX=${3:-$OSTIDX}
+	local ofacet=ost$((OSTIDX + 1))
 
-	test_mkdir -p $DIR/$tdir
-	local MDSIDX=$(get_mds_dir "$DIR/$tdir")
-	echo OSTIDX=$OSTIDX MDSIDX=$MDSIDX
+	test_mkdir -p -c1 $DIR/$tdir
+	local mdtidx=$($LFS getstripe -M $DIR/$tdir)
+	local mfacet=mds$((mdtidx + 1))
+	echo OSTIDX=$OSTIDX MDTIDX=$mdtidx
 
 	local OST=$(ostname_from_index $OSTIDX)
-	local MDT_INDEX=$(lfs df | grep "\[MDT:$((MDSIDX - 1))\]" | awk '{print $1}' | \
-			  sed -e 's/_UUID$//;s/^.*-//')
 
 	# on the mdt's osc
-	local mdtosc_proc1=$(get_mdtosc_proc_path mds${MDSIDX} $OST)
-	local last_id=$(do_facet mds${MDSIDX} lctl get_param -n \
+	local mdtosc_proc1=$(get_mdtosc_proc_path $mfacet $OST)
+	local last_id=$(do_facet $mfacet lctl get_param -n \
 			osc.$mdtosc_proc1.prealloc_last_id)
-	local next_id=$(do_facet mds${MDSIDX} lctl get_param -n \
+	local next_id=$(do_facet $mfacet lctl get_param -n \
 			osc.$mdtosc_proc1.prealloc_next_id)
 
-	local mdtosc_proc2=$(get_mdtosc_proc_path mds${MDSIDX})
-	do_facet mds${MDSIDX} lctl get_param osc.$mdtosc_proc2.prealloc*
+	local mdtosc_proc2=$(get_mdtosc_proc_path $mfacet)
+	do_facet $mfacet lctl get_param osc.$mdtosc_proc2.prealloc*
 
 	test_mkdir -p $DIR/$tdir/${OST}
 	$SETSTRIPE -i $OSTIDX -c 1 $DIR/$tdir/${OST}
 #define OBD_FAIL_OST_ENOSPC              0x215
-	do_facet ost$((OSTIDX + 1)) lctl set_param fail_val=$FAILIDX
-	do_facet ost$((OSTIDX + 1)) lctl set_param fail_loc=0x215
+	do_facet $ofacet lctl set_param fail_val=$FAILIDX fail_loc=0x215
 	echo "Creating to objid $last_id on ost $OST..."
 	createmany -o $DIR/$tdir/${OST}/f $next_id $((last_id - next_id + 2))
-	do_facet mds${MDSIDX} lctl get_param osc.$mdtosc_proc2.prealloc*
-	do_facet ost$((OSTIDX + 1)) lctl set_param fail_loc=$FAILLOC
+	do_facet $mfacet lctl get_param osc.$mdtosc_proc2.prealloc*
+	do_facet $ofacet lctl set_param fail_loc=$FAILLOC
 	sleep_maxage
 }
 
@@ -2571,7 +2587,7 @@ test_33b() {
         rm -fr $DIR/d33
         test_mkdir -p $DIR/d33
         chown $RUNAS_ID $DIR/d33
-        $RUNAS $OPENFILE -f 1286739555 $DIR/d33/f33
+        $RUNAS $OPENFILE -f 1286739555 $DIR/d33/f33 || true
 }
 run_test 33b "test open file with malformed flags (No panic)"
 
@@ -3796,6 +3812,10 @@ run_test 46 "dirtying a previously written page ================"
 # test_47 is removed "Device nodes check" is moved to test_28
 
 test_48a() { # bug 2399
+	[ $(facet_fstype $SINGLEMDS) = "zfs" ] &&
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.3.63) ] &&
+		skip "MDS prior to 2.3.63 handle ZFS dir .. incorrectly" &&
+		return
 	check_kernel_version 34 || return 0
 	test_mkdir -p $DIR/$tdir
 	cd $DIR/$tdir
@@ -4776,6 +4796,8 @@ test_56v() {
 run_test 56v "check 'lfs find -mdt match with lfs getstripe -M' ======="
 
 test_56w() {
+	[[ $OSTCOUNT -lt 2 ]] && skip_env "$OSTCOUNT < 2 OSTs -- skipping" &&
+		return
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
 	TDIR=$DIR/${tdir}w
 
@@ -4826,6 +4848,29 @@ test_56w() {
 
     check_stripe_count $TDIR/file1 $expected
 
+	if [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.6.90) ];
+	then
+		# lfs_migrate file onto OST 0 if it is on OST 1, or onto
+		# OST 1 if it is on OST 0. This file is small enough to
+		# be on only one stripe.
+		file=$TDIR/migr_1_ost
+		dd bs=$dd_bs count=1 if=/dev/urandom of=$file >/dev/null 2>&1 ||
+			error "write data into $file failed"
+		local obdidx=$($LFS getstripe -i $file)
+		local oldmd5=$(md5sum $file)
+		local newobdidx=0
+		[[ $obdidx -eq 0 ]] && newobdidx=1
+		cmd="$LFS migrate -i $newobdidx $file"
+		echo $cmd
+		eval $cmd || error "$cmd failed"
+		local realobdix=$($LFS getstripe -i $file)
+		local newmd5=$(md5sum $file)
+		[[ $newobdidx -ne $realobdix ]] &&
+			error "new OST is different (was=$obdidx, wanted=$newobdidx, got=$realobdix)"
+		[[ "$oldmd5" != "$newmd5" ]] &&
+			error "md5sum differ: $oldmd5, $newmd5"
+	fi
+
     # lfs_migrate dir
     cmd="$LFS_MIGRATE -y -c $expected $TDIR/dir1"
     echo "$cmd"
@@ -4960,16 +5005,17 @@ test_57b() {
 	fi
 
 	remote_mds_nodsh && skip "remote MDS with nodsh" && return
-	local dir=$DIR/d57b
+	local dir=$DIR/$tdir
 
 	local FILECOUNT=100
 	local FILE1=$dir/f1
 	local FILEN=$dir/f$FILECOUNT
 
 	rm -rf $dir || error "removing $dir"
-	test_mkdir -p $dir || error "creating $dir"
-	local num=$(get_mds_dir $dir)
-	local mymds=mds$num
+	test_mkdir -p -c1 $dir || error "creating $dir"
+	local mdtidx=$($LFS getstripe -M $dir)
+	local mdtname=MDT$(printf %04x $mdtidx)
+	local facet=mds$((mdtidx + 1))
 
 	echo "mcreating $FILECOUNT files"
 	createmany -m $dir/f 1 $FILECOUNT || \
@@ -4982,9 +5028,9 @@ test_57b() {
 	sync
 	sleep 1
 	df $dir  #make sure we get new statfs data
-	local MDSFREE=$(do_facet $mymds \
-		lctl get_param -n osd*.*MDT000$((num -1)).kbytesfree)
-	local MDCFREE=$(lctl get_param -n mdc.*MDT000$((num -1))-mdc-*.kbytesfree)
+	local MDSFREE=$(do_facet $facet \
+		lctl get_param -n osd*.*$mdtname.kbytesfree)
+	local MDCFREE=$(lctl get_param -n mdc.*$mdtname-mdc-*.kbytesfree)
 	echo "opening files to create objects/EAs"
 	local FILE
 	for FILE in `seq -f $dir/f%g 1 $FILECOUNT`; do
@@ -4997,9 +5043,9 @@ test_57b() {
 
 	sleep 1  #make sure we get new statfs data
 	df $dir
-	local MDSFREE2=$(do_facet $mymds \
-		lctl get_param -n osd*.*MDT000$((num -1)).kbytesfree)
-	local MDCFREE2=$(lctl get_param -n mdc.*MDT000$((num -1))-mdc-*.kbytesfree)
+	local MDSFREE2=$(do_facet $facet \
+		lctl get_param -n osd*.*$mdtname.kbytesfree)
+	local MDCFREE2=$(lctl get_param -n mdc.*$mdtname-mdc-*.kbytesfree)
 	if [[ $MDCFREE2 -lt $((MDCFREE - 16)) ]]; then
 		if [ "$MDSFREE" != "$MDSFREE2" ]; then
 			error "MDC before $MDCFREE != after $MDCFREE2"
@@ -6852,6 +6898,11 @@ test_102p() { # LU-4703 setxattr did not check ownership
 }
 run_test 102p "check setxattr(2) correctly fails without permission"
 
+test_102q() {
+	orphan_linkea_check $DIR/$tfile || error "orphan_linkea_check"
+}
+run_test 102q "flistxattr should not return trusted.link EAs for orphans"
+
 run_acl_subtest()
 {
     $LUSTRE/tests/acl/run $LUSTRE/tests/acl/$1.test
@@ -8168,6 +8219,10 @@ test_124a() {
         local MAX_HRS=10
 	local LIMIT=$($LCTL get_param -n $NSDIR.pool.limit)
 	log "LIMIT=$LIMIT"
+	if [ $LIMIT -lt $LRU_SIZE ]; then
+	    skip "Limit is too small $LIMIT"
+	    return 0
+	fi
 
         # Make LVF so higher that sleeping for $SLEEP is enough to _start_
         # killing locks. Some time was spent for creating locks. This means
@@ -8863,15 +8918,16 @@ som_mode_switch() {
 
 test_132() { #1028, SOM
 	[ $PARALLEL == "yes" ] && skip "skip parallel run" && return
-        remote_mds_nodsh && skip "remote MDS with nodsh" && return
-        local num=$(get_mds_dir $DIR)
-        local mymds=mds${num}
-        local MOUNT_OPTS_SAVE=$MOUNT_OPTS
+	remote_mds_nodsh && skip "remote MDS with nodsh" && return
+	local mdtidx=$($LFS getstripe -M $DIR)
+	local facet=mds$((mdtidx + 1))
 
-        dd if=/dev/zero of=$DIR/$tfile count=1 2>/dev/null
-        cancel_lru_locks osc
+	local MOUNTOPT_SAVE=$MOUNTOPT
 
-        som1=$(do_facet $mymds "$LCTL get_param -n mdt.*.som" | head -n 1)
+	dd if=/dev/zero of=$DIR/$tfile count=1 2>/dev/null
+	cancel_lru_locks osc
+	som1=$(do_facet $facet "$LCTL get_param mdt.*.som" |
+	       awk -F= ' {print $2}' | head -n 1)
 
         gl1=$(get_ost_param "ldlm_glimpse_enqueue")
         stat $DIR/$tfile >/dev/null
@@ -8883,7 +8939,8 @@ test_132() { #1028, SOM
         dd if=/dev/zero of=$DIR/$tfile count=1 2>/dev/null
         cancel_lru_locks osc
 
-        som2=$(do_facet $mymds "$LCTL get_param -n mdt.*.som" | head -n 1)
+	som2=$(do_facet $facet "$LCTL get_param mdt.*.som" |
+	       awk -F= ' {print $2}' | head -n 1)
         if [ $som1 == $som2 ]; then
             error "som is still "$som2
             if [ x$som2 = x"enabled" ]; then
@@ -10503,6 +10560,8 @@ check_path() {
     local fid=$2
 
     local path=$(${LFS} fid2path $*)
+    # Remove the '//' indicating a remote directory
+    path=$(echo $path | sed 's#//#/#g')
     RC=$?
 
     if [ $RC -ne 0 ]; then
@@ -10597,6 +10656,33 @@ test_162b() {
 }
 run_test 162b "striped directory path lookup sanity"
 
+# LU-4239: Verify fid2path works with paths 100 or more directories deep
+test_162c() {
+	test_mkdir $DIR/$tdir.local
+	test_mkdir $DIR/$tdir.remote
+	local lpath=$tdir.local
+	local rpath=$tdir.remote
+
+	for ((i = 0; i <= 101; i++)); do
+		lpath="$lpath/$i"
+		mkdir $DIR/$lpath
+		FID=$($LFS path2fid $DIR/$lpath | tr -d '[]') ||
+			error "get fid for local directory $DIR/$lpath failed"
+		check_path "$DIR/$lpath" $MOUNT $FID --link 0 ||
+			error "check path for local directory $DIR/$lpath failed"
+
+		rpath="$rpath/$i"
+		test_mkdir $DIR/$rpath
+		FID=$($LFS path2fid $DIR/$rpath | tr -d '[]') ||
+			error "get fid for remote directory $DIR/$rpath failed"
+		check_path "$DIR/$rpath" $MOUNT $FID --link 0 ||
+			error "check path for remote directory $DIR/$rpath failed"
+	done
+
+	return 0
+}
+run_test 162c "fid2path works with paths 100 or more directories deep"
+
 test_169() {
 	# do directio so as not to populate the page cache
 	log "creating a 10 Mb file"
@@ -11108,6 +11194,7 @@ test_200() {
 	local ost_range="$first_ost $last_ost $ost_step"
 	local test_path=$POOL_ROOT/$POOL_DIR_NAME
 	local file_dir=$POOL_ROOT/file_tst
+	local subdir=$test_path/subdir
 
 	local rc=0
 	while : ; do
@@ -11118,6 +11205,8 @@ test_200() {
 		mkdir -p $test_path
 		pool_set_dir      $POOL $test_path	|| { rc=$? ; break; }
 		pool_check_dir    $POOL $test_path	|| { rc=$? ; break; }
+		mkdir -p $subdir
+		pool_check_dir    $POOL $subdir		|| { rc=$? ; break; }
 		pool_dir_rel_path $POOL $POOL_DIR_NAME $POOL_ROOT \
 							|| { rc=$? ; break; }
 		# former test_200e test_200f
@@ -11369,6 +11458,15 @@ test_205() { # Job stats
 		jobids=$($LFS changelog $MDT0 | tail -9 | grep -c "j=")
 		[ $jobids -eq 9 ] ||
 			error "Wrong changelog jobid count $jobids != 9"
+
+		# LU-5862
+		JOBENV="disable"
+		jobstats_set $JOBENV
+		touch $DIR/$tfile
+		$LFS changelog $MDT0 | tail -1
+		jobids=$($LFS changelog $MDT0 | tail -1 | grep -c "j=")
+		[ $jobids -eq 0 ] ||
+			error "Unexpected jobids when jobid_var=$JOBENV"
 	fi
 
 	# cleanup
@@ -12724,6 +12822,19 @@ test_241() {
 }
 run_test 241 "bio vs dio"
 
+test_242() {
+	mkdir -p $DIR/$tdir
+	touch $DIR/$tdir/$tfile
+
+	#define OBD_FAIL_MDS_READPAGE_PACK	0x105
+	do_facet mds1 lctl set_param fail_loc=0x105
+	/bin/ls $DIR/$tdir && error "ls $DIR/$tdir should fail"
+
+	do_facet mds1 lctl set_param fail_loc=0
+	/bin/ls $DIR/$tdir || error "ls $DIR/$tdir failed"
+}
+run_test 242 "mdt_readpage failure should not cause directory unreadable"
+
 cleanup_test_300() {
 	trap 0
 	umask $SAVE_UMASK