X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=96a7081f434ba964046a05a6919631ad7bf7a7d5;hb=85ba17462f0605b1ef609ad333cde5a71767b4e2;hp=6711e8ca194f08229c1bb0b3fd94d44909af2ded;hpb=5b92c60cc78c702f9f5b617d863695558d537cde;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 6711e8c..96a7081 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -1359,10 +1359,13 @@ test_27e() {
 run_test 27e "setstripe existing file (should return error) ======"
 
 test_27f() {
-	test_mkdir -p $DIR/d27
-	$SETSTRIPE -S 100 -i 0 -c 1 $DIR/d27/fbad && error "setstripe failed"
-	dd if=/dev/zero of=$DIR/d27/fbad bs=4k count=4 || error "dd failed"
-	$GETSTRIPE $DIR/d27/fbad || error "$GETSTRIPE failed"
+	test_mkdir $DIR/$tdir
+	$SETSTRIPE -S 100 -i 0 -c 1 $DIR/$tdir/$tfile &&
+		error "$SETSTRIPE $DIR/$tdir/$tfile failed"
+	$CHECKSTAT -t file $DIR/$tdir/$tfile &&
+		error "$CHECKSTAT -t file $DIR/$tdir/$tfile should fail"
+	dd if=/dev/zero of=$DIR/$tdir/$tfile bs=4k count=4 || error "dd failed"
+	$GETSTRIPE $DIR/$tdir/$tfile || error "$GETSTRIPE failed"
 }
 run_test 27f "setstripe with bad stripe size (should return error)"
 
@@ -6854,6 +6857,8 @@ test_103a() {
 		skip_env "could not find setfacl" && return
 	$GSS && skip "could not run under gss" && return
 
+	gpasswd -a daemon bin	# LU-5641
+
 	declare -a identity_old
 
 	for num in $(seq $MDSCOUNT); do
@@ -11236,6 +11241,10 @@ test_205() { # Job stats
 		trap jobstats_set EXIT
 	fi
 
+	local user=$(do_facet $SINGLEMDS $LCTL --device $MDT0 \
+		     changelog_register -n)
+	echo "Registered as changelog user $user"
+
 	# mkdir
 	cmd="mkdir $DIR/$tfile"
 	verify_jobstats "$cmd" "mdt"
@@ -11267,6 +11276,15 @@ test_205() { # Job stats
 	cmd="mv -f $DIR/$tfile $DIR/jobstats_test_rename"
 	verify_jobstats "$cmd" "mdt"
 
+	# Ensure that jobid are present in changelog (if supported by MDS)
+	if [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.6.52) ]
+	then
+		$LFS changelog $MDT0 | tail -9
+		jobids=$($LFS changelog $MDT0 | tail -9 | grep -c "j=")
+		[ $jobids -eq 9 ] ||
+			error "Wrong changelog jobid count $jobids != 9"
+	fi
+
 	# cleanup
 	rm -f $DIR/jobstats_test_rename