X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-flr.sh;h=2631ecaedd05e662c95902abbc2a1e88b8660a29;hb=1499531d9e9fa14ee089a3e85bf8a8579636c60d;hp=f5faf0288d5b1f02ffe9279e11c89e13f9820922;hpb=ef9b70e0bfac26b66939b00d91f603c96926da04;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity-flr.sh b/lustre/tests/sanity-flr.sh
index f5faf02..2631eca 100644
--- a/lustre/tests/sanity-flr.sh
+++ b/lustre/tests/sanity-flr.sh
@@ -9,7 +9,7 @@ SRCDIR=$(dirname $0)
 export PATH=$PWD/$SRCDIR:$SRCDIR:$PWD/$SRCDIR/../utils:$PATH:/sbin
 
 ONLY=${ONLY:-"$*"}
-# Bug number for skipped test:
+# Bug number for skipped test:    LU-11381
 ALWAYS_EXCEPT="$SANITY_FLR_EXCEPT 201"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
@@ -64,7 +64,7 @@ stop_osts() {
 	done
 
 	for idx in "$@"; do
-		wait_osc_import_state client ost$idx DISCONN
+		wait_osc_import_state client ost$idx "\(DISCONN\|IDLE\)"
 	done
 }
 
@@ -77,7 +77,7 @@ start_osts() {
 	done
 
 	for idx in "$@"; do
-		wait_osc_import_state client ost$idx FULL
+		wait_recovery_complete ost$idx
 	done
 }
 
@@ -87,7 +87,7 @@ start_osts() {
 verify_mirror_count() {
 	local tf=$1
 	local expected=$2
-	local mirror_count=$(get_mirror_ids $tf)
+	local mirror_count=$($LFS getstripe -N $tf)
 
 	[[ $mirror_count = $expected ]] || {
 		$LFS getstripe -v $tf
@@ -143,10 +143,23 @@ verify_comp_attr() {
 		local fl
 		local expected_list=$(comma_list $expected)
 		for fl in ${expected_list//,/ }; do
-			echo $value | grep -q $fl || {
+			local neg=0
+
+			[[ ${fl:0:1} = "^" ]] && neg=1
+			[[ $neg = 1 ]] && fl=${fl:1}
+
+			$(echo $value | grep -q $fl)
+			local match=$?
+			# 0: matched; 1: not matched
+
+			if  [[ $neg = 0 && $match != 0 ||
+			       $neg = 1 && $match = 0 ]]; then
 				$getstripe_cmd $tf
-				error "expected flag $fl existing on $comp_id"
-			}
+				[[ $neg = 0 ]] && # expect the flag
+				    error "expected flag '$fl' not in $comp_id"
+				[[ $neg = 1 ]] && # not expect the flag
+				    error "not expected flag '$fl' in $comp_id"
+			fi
 		done
 		return
 	}
@@ -661,10 +674,19 @@ test_0g() {
 run_test 0g "lfs mirror create flags support"
 
 test_0h() {
-	local tf=$DIR/$tfile
+	local td=$DIR/$tdir
+	local tf=$td/$tfile
+	local ids
+	local i
 
-	$LFS mirror create -N -E 1M -S 1M --flags=prefer -E eof -N2 $tf ||
-		error "create mirrored file $tf failed"
+	# create parent directory
+	test_mkdir $td || error "mkdir $td failed"
+
+	$LFS setstripe -N -E 1M -S 1M --flags=prefer -E eof -N2 $td ||
+		error "set default mirrored layout on directory $td failed"
+
+	# verify flags are inherited from the directory
+	touch $tf
 
 	verify_comp_attr lcme_flags $tf 0x10001 prefer
 	verify_comp_attr lcme_flags $tf 0x10002 prefer
@@ -730,8 +752,6 @@ test_2() {
 	$LFS setstripe -E 1M -S 1M -E EOF -c 1 $tf
 	$LFS setstripe -E 2M -S 1M -E EOF -c -1 $tf2
 
-	local layout=$($LFS getstripe $tf2 | grep -A 4 lmm_objects)
-
 	$LFS mirror extend -N -f $tf2 $tf ||
 		error "merging $tf2 into $tf failed"
 
@@ -962,7 +982,7 @@ test_32() {
 		error "extending mirrored file $DIR/$tfile failed"
 
 	# make sure the mirrored file was created successfully
-	[ $(get_mirror_ids $DIR/$tfile) -eq 2 ] ||
+	[ $($LFS getstripe -N $DIR/$tfile) -eq 2 ] ||
 		{ $LFS getstripe $DIR/$tfile; error "expected 2 mirrors"; }
 
 	drop_client_cache
@@ -1011,7 +1031,7 @@ test_33() {
 		      "without verification failed"
 
 	# make sure that $tfile has two mirrors and $tfile-2 does not exist
-	[ $(get_mirror_ids $DIR/$tfile) -eq 2 ] ||
+	[ $($LFS getstripe -N $DIR/$tfile) -eq 2 ] ||
 		{ $LFS getstripe $DIR/$tfile; error "expected count 2"; }
 
 	[[ ! -e $DIR/$tfile-2 ]] || error "$DIR/$tfile-2 was not unlinked"
@@ -1183,7 +1203,7 @@ test_36() {
 
 	create_file_36 $tf $tf-2 $tf-3
 
-	[ $(get_mirror_ids $tf) -gt 1 ] || error "wrong mirror count"
+	[ $($LFS getstripe -N $tf) -gt 1 ] || error "wrong mirror count"
 
 	# test case 1 - check file write and verify layout version
 	$MULTIOP $tf oO_WRONLY:c ||
@@ -1199,13 +1219,13 @@ test_36() {
 	verify_ost_layout_version $tf
 
 	# test case 2
-	local mds_idx=mds$(($($LFS getstripe -M $tf-2) + 1))
+	local mds_facet=mds$(($($LFS getstripe -m $tf-2) + 1))
 
 	local delay_sec=10
-	do_facet $mds_idx $LCTL set_param fail_val=$delay_sec
+	do_facet $mds_facet $LCTL set_param fail_val=$delay_sec
 
 	#define OBD_FAIL_FLR_LV_DELAY 0x1A01
-	do_facet $mds_idx $LCTL set_param fail_loc=0x1A01
+	do_facet $mds_facet $LCTL set_param fail_loc=0x1A01
 
 	# write should take at least $fail_loc seconds and succeed
 	local st=$(date +%s)
@@ -1217,19 +1237,19 @@ test_36() {
 	# verify OST layout version
 	verify_ost_layout_version $tf
 
-	do_facet $mds_idx $LCTL set_param fail_loc=0
+	do_facet $mds_facet $LCTL set_param fail_loc=0
 
 	# test case 3
-	mds_idx=mds$(($($LFS getstripe -M $tf-3) + 1))
+	mds_idx=mds$(($($LFS getstripe -m $tf-3) + 1))
 
 	#define OBD_FAIL_FLR_LV_INC 0x1A02
-	do_facet $mds_idx $LCTL set_param fail_loc=0x1A02
+	do_facet $mds_facet $LCTL set_param fail_loc=0x1A02
 
 	# write open file should return error
 	$MULTIOP $tf-3 oO_WRONLY:O_SYNC:w1024c &&
 		error "write a mirrored file succeeded" || true
 
-	do_facet $mds_idx $LCTL set_param fail_loc=0
+	do_facet $mds_facet $LCTL set_param fail_loc=0
 }
 run_test 36 "write to mirrored files"
 
@@ -1253,14 +1273,17 @@ test_37()
 	local tf=$DIR/$tfile
 	local tf2=$DIR/$tfile-2
 	local tf3=$DIR/$tfile-3
+	local tf4=$DIR/$tfile-4
 
 	create_files_37 $((RANDOM + 15 * 1048576)) $tf $tf2 $tf3
+	rm -f $tf4
+	cp $tf $tf4
 
 	# assume the mirror id will be 1, 2, and 3
 	declare -A checksums
-	checksums[1]=$(md5sum $tf | cut -f 1 -d' ')
-	checksums[2]=$(md5sum $tf2 | cut -f 1 -d' ')
-	checksums[3]=$(md5sum $tf3 | cut -f 1 -d' ')
+	checksums[1]=$(cat $tf | md5sum)
+	checksums[2]=$(cat $tf2 | md5sum)
+	checksums[3]=$(cat $tf3 | md5sum)
 
 	printf '%s\n' "${checksums[@]}"
 
@@ -1277,11 +1300,20 @@ test_37()
 
 	local sum
 	for i in ${mirror_array[@]}; do
-		sum=$(mirror_io dump -i $i $tf | md5sum | cut -f 1 -d' ')
+		$LCTL set_param ldlm.namespaces.*.lru_size=clear > /dev/null
+		sum=$($LFS mirror read -N $i $tf | md5sum)
 		[ "$sum" = "${checksums[$i]}" ] ||
 			error "$i: mismatch: \'${checksums[$i]}\' vs. \'$sum\'"
 	done
 
+	# verify mirror write
+	echo "Verifying mirror write .."
+	$LFS mirror write -N2 $tf < $tf4
+
+	sum=$($LFS mirror read -N2 $tf | md5sum)
+	[[ "$sum" = "${checksums[1]}" ]] ||
+		error "2: mismatch \'${checksums[1]}\' vs. \'$sum\'"
+
 	# verify mirror copy, write to this mirrored file will invalidate
 	# the other two mirrors
 	echo "Verifying mirror copy .."
@@ -1300,7 +1332,7 @@ test_37()
 	# verify copying is successful by checking checksums
 	remount_client $MOUNT
 	for i in ${mirror_array[@]}; do
-		sum=$(mirror_io dump -i $i $tf | md5sum | cut -f 1 -d' ')
+		sum=$($LFS mirror read -N $i $tf | md5sum)
 		[ "$sum" = "${checksums[1]}" ] ||
 			error "$i: mismatch checksum after copy"
 	done
@@ -1345,13 +1377,13 @@ test_38() {
 	local fsize=$((RANDOM << 8 + 1048576))
 	$TRUNCATE $ref $fsize
 
-	local ref_cksum=$(md5sum $ref | cut -f 1 -d' ')
+	local ref_cksum=$(cat $ref | md5sum)
 
 	# case 1: verify write to mirrored file & resync work
 	cp $ref $tf || error "copy from $ref to $f error"
 	verify_flr_state $tf "wp"
 
-	local file_cksum=$(md5sum $tf | cut -f 1 -d' ')
+	local file_cksum=$(cat $tf | md5sum)
 	[ "$file_cksum" = "$ref_cksum" ] || error "write failed, cksum mismatch"
 
 	get_mirror_ids $tf
@@ -1359,8 +1391,7 @@ test_38() {
 
 	local valid_mirror stale_mirror id mirror_cksum
 	for id in "${mirror_array[@]}"; do
-		mirror_cksum=$(mirror_io dump -i $id $tf |
-				md5sum | cut -f 1 -d' ')
+		mirror_cksum=$($LFS mirror read -N $id $tf | md5sum)
 		[ "$ref_cksum" == "$mirror_cksum" ] &&
 			{ valid_mirror=$id; continue; }
 
@@ -1373,8 +1404,7 @@ test_38() {
 	mirror_io resync $tf || error "resync failed"
 	verify_flr_state $tf "ro"
 
-	mirror_cksum=$(mirror_io dump -i $stale_mirror $tf |
-			md5sum | cut -f 1 -d' ')
+	mirror_cksum=$($LFS mirror read -N $stale_mirror $tf | md5sum)
 	[ "$file_cksum" = "$ref_cksum" ] || error "resync failed"
 
 	# case 2: inject an error to make mirror_io exit after changing
@@ -1479,9 +1509,11 @@ test_41() {
 	# write data in [0, 2M)
 	dd if=/dev/zero of=$tf bs=1M count=2 conv=notrunc ||
 		error "writing $tf failed"
-	dd if=/dev/zero of=$tf-1 bs=1M count=4 conv=notrunc ||
+	dd if=/dev/urandom of=$tf-1 bs=1M count=4 conv=notrunc ||
 		error "writing $tf-1 failed"
 
+	local sum0=$(cat $tf-1 | md5sum)
+
 	echo " **verify files be WRITE_PENDING"
 	verify_flr_state $tf "wp"
 	verify_flr_state $tf-1 "wp"
@@ -1496,6 +1528,13 @@ test_41() {
 	echo " **full resync"
 	$LFS mirror resync $tf $tf-1 || error "mirror resync $tf $tf-1 failed"
 
+	echo " **verify $tf-1 data consistency in all mirrors"
+	for i in 1 2 3; do
+		local sum=$($LFS mirror read -N$i $tf-1 | md5sum)
+		[[ "$sum" = "$sum0" ]] ||
+			error "$tf-1.$i: checksum mismatch: $sum != $sum0"
+	done
+
 	echo " **verify files be RDONLY"
 	verify_flr_state $tf "ro"
 	verify_flr_state $tf-1 "ro"
@@ -1870,6 +1909,138 @@ test_46() {
 }
 run_test 46 "Verify setstripe --copy option"
 
+test_47() {
+	[ $OSTCOUNT -lt 3 ] && skip "needs >= 3 OSTs" && return
+
+	local file=$DIR/$tdir/$tfile
+	local ids
+	local ost
+	local osts
+
+	test_mkdir $DIR/$tdir
+
+	# test case 1:
+	rm -f $file
+	# mirror1: [comp0]ost0,    [comp1]ost1 and ost2
+	# mirror2: [comp2]    ,    [comp3] should not use ost1 or ost2
+	$LFS mirror create -N -E2m -c1 -o0 --flags=prefer -Eeof -c2 -o1,2 \
+		-N -E2m -c1 -Eeof -c1 $file || error "create FLR $file failed"
+	ids=($($LFS getstripe $file | awk '/lcme_id/{print $2}' | tr '\n' ' '))
+
+	dd if=/dev/zero of=$file bs=1M count=3 || error "dd $file failed"
+	$LFS mirror resync $file || error "resync $file failed"
+
+	ost=$($LFS getstripe -I${ids[2]} $file | awk '/l_ost_idx/{print $5}')
+	if [[ x$ost == "x0," ]]; then
+		$LFS getstripe $file
+		error "component ${ids[2]} objects allocated on $ost " \
+		      "shouldn't on OST0"
+	fi
+
+	ost=$($LFS getstripe -I${ids[3]} $file | awk '/l_ost_idx/{print $5}')
+	if [[ x$ost == "x1," || x$ost == "x2," ]]; then
+		$LFS getstripe $file
+		error "component ${ids[3]} objects allocated on $ost " \
+		      "shouldn't on OST1 or on OST2"
+	fi
+
+	## test case 2:
+	rm -f $file
+	# mirror1: [comp0]    [comp1]
+	# mirror2: [comp2]    [comp3]
+	# mirror3: [comp4]    [comp5]
+	# mirror4: [comp6]    [comp7]
+	$LFS mirror create -N4 -E1m -c1 -Eeof -c1 $file ||
+		error "create FLR $file failed"
+	ids=($($LFS getstripe $file | awk '/lcme_id/{print $2}' | tr '\n' ' '))
+
+	dd if=/dev/zero of=$file bs=1M count=3 || error "dd $file failed"
+	$LFS mirror resync $file || error "resync $file failed"
+
+	for ((i = 0; i < 6; i++)); do
+		osts[$i]=$($LFS getstripe -I${ids[$i]} $file |
+			awk '/l_ost_idx/{print $5}')
+	done
+	# comp[0],comp[2],comp[4] should use different osts
+	if [[ ${osts[0]} == ${osts[2]} || ${osts[0]} == ${osts[4]} ||
+	      ${osts[2]} == ${osts[4]} ]]; then
+		$LFS getstripe $file
+		error "component ${ids[0]}, ${ids[2]}, ${ids[4]} have objects "\
+		      "allocated on duplicated OSTs"
+	fi
+	# comp[1],comp[3],comp[5] should use different osts
+	if [[ ${osts[1]} == ${osts[3]} || ${osts[1]} == ${osts[5]} ||
+	      ${osts[3]} == ${osts[5]} ]]; then
+		$LFS getstripe $file
+		error "component ${ids[1]}, ${ids[3]}, ${ids[5]} have objects "\
+		      "allocated on duplicated OSTs"
+	fi
+
+	return 0
+}
+run_test 47 "Verify mirror obj alloc"
+
+test_48() {
+	local tf=$DIR/$tfile
+
+	rm -f $tf
+	echo " ** create 2 mirrors FLR file $tf"
+	$LFS mirror create -N -E2M -Eeof --flags prefer \
+			   -N -E1M -Eeof $tf ||
+		error "create FLR file $tf failed"
+
+	echo " ** write it"
+	dd if=/dev/urandom of=$tf bs=1M count=3 || error "write $tf failed"
+	verify_flr_state $tf "wp"
+
+	local sum0=$(md5sum < $tf)
+
+	echo " ** resync the file"
+	$LFS mirror resync $tf
+
+	echo " ** snapshot mirror 2"
+	$LFS setstripe --comp-set -I 0x20003 --comp-flags=nosync $tf
+
+	echo " ** write it again"
+	dd if=/dev/urandom of=$tf bs=1M count=3 || error "write $tf failed"
+	echo " ** resync it again"
+	$LFS mirror resync $tf
+
+	verify_flr_state $tf "wp"
+	verify_comp_attr lcme_flags $tf 0x20003 nosync,stale
+
+	local sum1=$($LFS mirror read -N1 $tf | md5sum)
+	local sum2=$($LFS mirror read -N2 $tf | md5sum)
+
+	echo " ** verify mirror 2 doesn't change"
+	echo "original checksum: $sum0"
+	echo "mirror 1 checksum: $sum1"
+	echo "mirror 2 checksum: $sum2"
+	[[ $sum0 = $sum2 ]] ||
+		error "original checksum: $sum0, mirror 2 checksum: $sum2"
+	echo " ** mirror 2 stripe info"
+	$LFS getstripe -v --mirror-index=2 $tf
+
+	echo " ** resync mirror 2"
+	$LFS mirror resync --only 2 $tf
+
+	verify_flr_state $tf "ro"
+	verify_comp_attr lcme_flags $tf 0x20003 nosync,^stale
+
+	sum1=$($LFS mirror read -N1 $tf | md5sum)
+	sum2=$($LFS mirror read -N2 $tf | md5sum)
+
+	echo " ** verify mirror 2 resync-ed"
+	echo "original checksum: $sum0"
+	echo "mirror 1 checksum: $sum1"
+	echo "mirror 2 checksum: $sum2"
+	[[ $sum1 = $sum2 ]] ||
+		error "mirror 1 checksum: $sum1, mirror 2 checksum: $sum2"
+	echo " ** mirror 2 stripe info"
+	$LFS getstripe -v --mirror-index=2 $tf
+}
+run_test 48 "Verify snapshot mirror"
+
 ctrl_file=$(mktemp /tmp/CTRL.XXXXXX)
 lock_file=$(mktemp /var/lock/FLR.XXXXXX)
 
@@ -1926,9 +2097,13 @@ resync_file_200() {
 
 		echo -n "resync file $tf with '$cmd' .."
 
-		$lock_taken && flock -x 200
-		$cmd $tf &> /dev/null && echo "done" || echo "failed"
-		$lock_taken && flock -u 200
+		if [[ $lock_taken = "true" ]]; then
+			flock -x 200 -c "$cmd $tf &> /dev/null" &&
+				echo "done" || echo "failed"
+			flock -u 200
+		else
+			$cmd $tf &> /dev/null && echo "done" || echo "failed"
+		fi
 
 		sleep 0.$((RANDOM % 8 + 1))
 	done
@@ -1957,7 +2132,7 @@ test_200() {
 	#define OBD_FAIL_FLR_RANDOM_PICK_MIRROR	0x1A03
 	$LCTL set_param fail_loc=0x1A03
 
-	local mds_idx=mds$(($($LFS getstripe -M $tf) + 1))
+	local mds_idx=mds$(($($LFS getstripe -m $tf) + 1))
 	do_facet $mds_idx $LCTL set_param fail_loc=0x1A03
 
 	declare -a pids
@@ -1998,9 +2173,9 @@ test_200() {
 	mirror_io resync $tf
 	get_mirror_ids $tf
 
-	local csum=$(mirror_io dump -i ${mirror_array[0]} $tf | md5sum)
+	local csum=$($LFS mirror read -N ${mirror_array[0]} $tf | md5sum)
 	for id in ${mirror_array[@]:1}; do
-		[ "$(mirror_io dump -i $id $tf | md5sum)" = "$csum" ] ||
+		[ "$($LFS mirror read -N $id $tf | md5sum)" = "$csum" ] ||
 			error "checksum error for mirror $id"
 	done
 
@@ -2078,6 +2253,39 @@ test_202() {
 }
 run_test 202 "lfs setstripe --add-component wide striping"
 
+test_203() {
+	[[ $OSTCOUNT -lt 2 ]] && skip "need >= 2 OSTs" && return
+
+	local tf=$DIR/$tfile
+
+	#create 2 mirrors
+	$LFS mirror create -N2 -c1 $tf || error "create FLR file $tf"
+	#delete first mirror
+	$LFS mirror split --mirror-id=1 -d $tf || error "delete first mirror"
+
+	$LFS getstripe $tf
+	local old_id=$($LFS getstripe --mirror-id=2 -I $tf)
+	local count=$($LFS getstripe --mirror-id=2 -c $tf) ||
+		error "getstripe count of mirror 2"
+	[[ x$count = x1 ]] || error "mirror 2 stripe count $count is not 1"
+
+	#extend a mirror with 2 OSTs
+	$LFS mirror extend -N -c2 $tf || error "extend mirror"
+	$LFS getstripe $tf
+
+	local new_id=$($LFS getstripe --mirror-id=2 -I $tf)
+	count=$($LFS getstripe --mirror-id=2 -c $tf) ||
+		error "getstripe count of mirror 2"
+	[[ x$oldid = x$newid ]] ||
+		error "mirror 2 changed ID from $old_id to $new_id"
+	[[ x$count = x1 ]] || error "mirror 2 stripe count $count is not 1"
+
+	count=$($LFS getstripe --mirror-id=3 -c $tf) ||
+		error "getstripe count of mirror 3"
+	[[ x$count = x2 ]] || error "mirror 3 stripe count $count is not 2"
+}
+run_test 203 "mirror file preserve mirror ID"
+
 complete $SECONDS
 check_and_cleanup_lustre
 exit_status