X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-flr.sh;h=07e52af4c08d970dc8edf073ff5bb509c375e0aa;hp=d48003b5bd3c2f19bcc4497eb601a9d4f18cc850;hb=8befc64e5aabe9b9bdca49f51830f25b3f747019;hpb=1eeb1455c2770edc92b2d127d5a2a22efe213773

diff --git a/lustre/tests/sanity-flr.sh b/lustre/tests/sanity-flr.sh
index d48003b..07e52af 100644
--- a/lustre/tests/sanity-flr.sh
+++ b/lustre/tests/sanity-flr.sh
@@ -5,22 +5,28 @@
 set -e
 set +o posix
 
-SRCDIR=$(dirname $0)
-export PATH=$PWD/$SRCDIR:$SRCDIR:$PWD/$SRCDIR/../utils:$PATH:/sbin
 
 ONLY=${ONLY:-"$*"}
-# Bug number for skipped test:    LU-11381
-ALWAYS_EXCEPT="$SANITY_FLR_EXCEPT 201"
-# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
-LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
-[[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.10.56) ]] ||
-	{ skip "Need MDS version at least 2.10.56"; exit 0; }
+ALWAYS_EXCEPT="$SANITY_FLR_EXCEPT "
+# Bug number for skipped test:    LU-11381
+ALWAYS_EXCEPT+="                  201 "
+# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
+
+# skip all tests for PPC until we can get sanity-pfl to pass
+if [[ $(uname -m) = ppc64 ]]; then
+	skip "Skip FLR testing for PPC clients"
+fi
+
+build_test_filter
+
+[[ "$MDS1_VERSION" -ge $(version_code 2.10.56) ]] ||
+	skip "Need MDS version at least 2.10.56"
 
 [ $UID -eq 0 -a $RUNAS_ID -eq 0 ] &&
 	error "\$RUNAS_ID set to 0, but \$UID is also 0!"
@@ -30,8 +36,6 @@ check_and_setup_lustre
 DIR=${DIR:-$MOUNT}
 assert_DIR
 
-build_test_filter
-
 assert_DIR
 rm -rf $DIR/[Rdfs][0-9]*
 
@@ -87,7 +91,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
@@ -274,6 +278,16 @@ verify_comp_attrs() {
 	verify_comp_attr_with_parent pool $tf $comp_id
 }
 
+verify_flr_state()
+{
+	local tf=$1
+	local expected_state=$2
+
+	local state=$($LFS getstripe -v $tf | awk '/lcm_flags/{ print $2 }')
+	[ $expected_state = $state ] ||
+		error "expected: $expected_state, actual $state"
+}
+
 # command line test cases
 test_0a() {
 	local td=$DIR/$tdir
@@ -381,6 +395,15 @@ test_0b() {
 	verify_comp_attr stripe-count $tf ${ids[5]} $OSTCOUNT
 	verify_comp_attr_with_parent pool $tf ${ids[5]}
 
+	if [ $MDS1_VERSION -ge $(version_code 2.12.55) ]; then
+		# LU-11022 - remove mirror by pool name
+		local=cnt cnt=$($LFS getstripe $tf | grep archive | wc -l)
+		[ "$cnt" != "1" ] && error "unexpected mirror count $cnt"
+		$LFS mirror delete --pool archive $tf || error "delete mirror"
+		cnt=$($LFS getstripe $tf | grep archive | wc -l)
+		[ "$cnt" != "0" ] && error "mirror count after removal: $cnt"
+	fi
+
 	# destroy OST pool
 	destroy_test_pools
 }
@@ -667,13 +690,16 @@ test_0g() {
 	cat $tf &> /dev/null || error "error reading file '$tf'"
 
 	# verify that the data was provided by OST1 where mirror 1 resides
-	local nr_read=$($LCTL get_param -n osc.$FSNAME-OST0000-osc-ffff*.stats |
+	local nr_read=$($LCTL get_param -n osc.$FSNAME-OST0000-osc-[-0-9a-f]*.stats |
 			awk '/ost_read/{print $2}')
 	[ -n "$nr_read" ] || error "read was not provided by OST1"
 }
 run_test 0g "lfs mirror create flags support"
 
 test_0h() {
+	[ $MDS1_VERSION -lt $(version_code 2.11.57) ] &&
+		skip "Need MDS version at least 2.11.57"
+
 	local td=$DIR/$tdir
 	local tf=$td/$tfile
 	local ids
@@ -709,9 +735,56 @@ test_0h() {
 		error "error setting flag prefer"
 
 	verify_comp_attr lcme_flags $tf 0x20003 prefer
+
+	$LFS setstripe --comp-set -I 0x20003 --comp-flags=^prefer $tf ||
+		error "error clearing prefer flag from component 0x20003"
+
+	# MDS disallows setting stale flag on the last non-stale mirror
+	[[ "$MDS1_VERSION" -ge $(version_code 2.12.57) ]] || return 0
+
+	cp /etc/hosts $tf || error "error writing file '$tf'"
+
+	verify_comp_attr lcme_flags $tf 0x10002 prefer
+	verify_comp_attr lcme_flags $tf 0x20003 stale
+	verify_comp_attr lcme_flags $tf 0x30004 stale
+
+	! $LFS setstripe --comp-set -I 0x10002 --comp-flags=^prefer,stale $tf \
+		> /dev/null 2>&1 ||
+		error "setting stale flag on component 0x10002 should fail"
+
+	$LFS mirror resync $tf || error "error resync-ing file '$tf'"
+
+	$LFS setstripe --comp-set -I 0x10001 --comp-flags=stale $tf ||
+		error "error setting stale flag on component 0x10001"
+	$LFS setstripe --comp-set -I 0x20003 --comp-flags=stale $tf ||
+		error "error setting stale flag on component 0x20003"
+
+	! $LFS setstripe --comp-set -I 0x30004 --comp-flags=stale $tf \
+		> /dev/null 2>&1 ||
+		error "setting stale flag on component 0x30004 should fail"
+
+	$LFS mirror resync $tf || error "error resync-ing file '$tf'"
 }
 run_test 0h "set, clear and test flags for FLR files"
 
+test_0j() {
+	$LFS mirror create -N2 $DIR/$tfile || error "create $DIR/$tfile failed"
+
+	cp /etc/hosts $DIR/$tfile || error "write to $DIR/$tfile failed"
+	$LFS mirror resync $DIR/$tfile || error "resync $DIR/$tfile failed"
+	cmp /etc/hosts $DIR/$tfile || error "cmp with /etc/hosts failed"
+
+	$LFS mirror read -N2 -o $TMP/$tfile $DIR/$tfile || "read mirror failed"
+	stack_trap "rm -f $TMP/$tfile"
+	cmp $TMP/$tfile $DIR/$tfile || error "cmp with $TMP/$tfile failed"
+	$LFS mirror write -N2 -i /etc/passwd $DIR/$tfile || "write failed"
+	$LFS setstripe --comp-set -I 65537 --comp-flags=stale $DIR/$tfile ||
+		error "set component 1 stale failed"
+	$LFS mirror resync $DIR/$tfile || error "resync $DIR/$tfile failed"
+	cmp /etc/passwd $DIR/$tfile || error "cmp with /etc/passwd failed"
+}
+run_test 0j "test lfs mirror read/write commands"
+
 test_1() {
 	local tf=$DIR/$tfile
 	local mirror_count=16 # LUSTRE_MIRROR_COUNT_MAX
@@ -895,7 +968,7 @@ get_osc_lock_count() {
 		local osc_name
 		local count
 
-		osc_name=${FSNAME}-OST$(printf "%04x" $((idx-1)))-osc-'ffff*'
+		osc_name=${FSNAME}-OST$(printf "%04x" $((idx-1)))-osc-'[-0-9a-f]*'
 		count=$($LCTL get_param -n ldlm.namespaces.$osc_name.lock_count)
 		lock_count=$((lock_count + count))
 	done
@@ -982,7 +1055,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
@@ -1000,7 +1073,7 @@ test_32() {
 }
 run_test 32 "data should be mirrored to newly created mirror"
 
-test_33() {
+test_33a() {
 	[[ $OSTCOUNT -lt 2 ]] && skip "need >= 2 OSTs" && return
 
 	rm -f $DIR/$tfile $DIR/$tfile-2
@@ -1031,7 +1104,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"
@@ -1060,10 +1133,8 @@ test_33() {
 	start_osts 1
 
 	# read file again with ost2 failed
-	$LCTL set_param ldlm.namespaces.lustre-*-osc-ffff*.lru_size=clear
-
-	fail ost2 &
-	sleep 1
+	stop_osts 2
+	drop_client_cache
 
 	# check size, glimpse should work
 	$CHECKSTAT -t file -s $fsize $DIR/$tfile ||
@@ -1074,9 +1145,116 @@ test_33() {
 	[[ "$rs" == "ost1" ]] ||
 		error "file content error: expected: \"ost1\", actual: \"$rs\""
 
-	wait_osc_import_state client ost2 FULL
+	start_osts 2
+}
+run_test 33a "read can choose available mirror to read"
+
+test_33b() {
+	[[ $OSTCOUNT -lt 2 ]] && skip "need >= 2 OSTs" && return
+
+	rm -f $DIR/$tfile
+
+	stack_trap "rm -f $DIR/$tfile" EXIT
+
+	# create a file with two mirrors on OST0000 and OST0001
+	$LFS setstripe -N -Eeof -o0 -N -Eeof -o1 $DIR/$tfile
+
+	# make sure that $tfile has two mirrors
+	[ $($LFS getstripe -N $DIR/$tfile) -eq 2 ] ||
+		{ $LFS getstripe $DIR/$tfile; error "expected count 2"; }
+
+	# write 50M
+	dd if=/dev/urandom of=$DIR/$tfile bs=2M count=25 ||
+		error "write failed for $DIR/$tfile"
+	$LFS mirror resync $DIR/$tfile || error "resync failed for $DIR/$tfile"
+	verify_flr_state $DIR/$tfile "ro"
+	drop_client_cache
+
+	ls -l $DIR/$tfile
+
+	# read file - all OSTs are available
+	echo "reading file (data can be provided by any ost)... "
+	local t1=$SECONDS
+	time cat $DIR/$tfile > /dev/null || error "read all"
+	local t2=$SECONDS
+	ra=$((t2 - t1))
+
+	# read file again with ost1 {OST0000} failed
+	stop_osts 1
+	drop_client_cache
+	echo "reading file (data should be provided by ost2)..."
+	t1=$SECONDS
+	time cat $DIR/$tfile > /dev/null || error "read ost2"
+	t2=$SECONDS
+	r1=$((t2 - t1))
+
+	# remount ost1
+	start_osts 1
+
+	# read file again with ost2 {OST0001} failed
+	stop_osts 2
+	drop_client_cache
+
+	echo "reading file (data should be provided by ost1)..."
+	t1=$SECONDS
+	time cat $DIR/$tfile > /dev/null || error "read ost1"
+	t2=$SECONDS
+	r2=$((t2 - t1))
+
+	# remount ost2
+	start_osts 2
+
+	[ $((r1 * 100)) -gt $((ra * 105)) -a $r1 -gt $((ra + 2)) ] &&
+		error "read mirror too slow without ost1, from $ra to $r1"
+	[ $((r2 * 100)) -gt $((ra * 105)) -a $r2 -gt $((ra + 2)) ] &&
+		error "read mirror too slow without ost2, from $ra to $r2"
+
+	wait_osc_import_ready client ost2
+}
+run_test 33b "avoid reading from unhealthy mirror"
+
+test_33c() {
+	[[ $OSTCOUNT -lt 3 ]] && skip "need >= 3 OSTs" && return
+
+	rm -f $DIR/$tfile
+
+	stack_trap "rm -f $DIR/$tfile" EXIT
+
+	# create a file with two mirrors
+	# mirror1: {OST0000, OST0001}
+	# mirror2: {OST0001, OST0002}
+	$LFS setstripe -N -Eeof -c2 -o0,1 -N -Eeof -c2 -o1,2 $DIR/$tfile
+
+	# make sure that $tfile has two mirrors
+	[ $($LFS getstripe -N $DIR/$tfile) -eq 2 ] ||
+		{ $LFS getstripe $DIR/$tfile; error "expected count 2"; }
+
+	# write 50M
+	dd if=/dev/urandom of=$DIR/$tfile bs=2M count=25 ||
+		error "write failed for $DIR/$tfile"
+	$LFS mirror resync $DIR/$tfile || error "resync failed for $DIR/$tfile"
+	verify_flr_state $DIR/$tfile "ro"
+	drop_client_cache
+
+	ls -l $DIR/$tfile
+
+	# read file - all OSTs are available
+	echo "reading file (data can be provided by any ost)... "
+	time cat $DIR/$tfile > /dev/null || error "read all"
+
+	# read file again with ost2 (OST0001) failed
+	stop_osts 2
+	drop_client_cache
+
+	echo "reading file (data should be provided by ost1 and ost3)..."
+	time cat $DIR/$tfile > /dev/null || error "read ost1 & ost3"
+
+	# remount ost2
+	start_osts 2
+
+	wait_osc_import_ready client ost2
 }
-run_test 33 "read can choose available mirror to read"
+run_test 33c "keep reading among unhealthy mirrors"
 
 test_34a() {
 	[[ $OSTCOUNT -lt 4 ]] && skip "need >= 4 OSTs" && return
@@ -1203,7 +1381,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 ||
@@ -1219,13 +1397,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)
@@ -1237,19 +1415,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))
 
 	#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"
 
@@ -1270,11 +1448,17 @@ create_files_37() {
 
 test_37()
 {
+	[ $MDS1_VERSION -lt $(version_code 2.11.57) ] &&
+		skip "Need MDS version at least 2.11.57"
+
 	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
@@ -1297,48 +1481,41 @@ test_37()
 
 	local sum
 	for i in ${mirror_array[@]}; do
-		sum=$($LFS mirror dump -N $i $tf | md5sum)
+		$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 .."
 
 	local osts=$(comma_list $(osts_nodes))
 
-	# define OBD_FAIL_OST_SKIP_LV_CHECK	0x241
-	do_nodes $osts lctl set_param fail_loc=0x241
-
-	mirror_io copy -i ${mirror_array[0]} \
-		-t $(echo ${mirror_array[@]:1} | tr ' ' ',') $tf ||
-			error "mirror copy error"
-
-	do_nodes $osts lctl set_param fail_loc=0
+	$LFS mirror copy -i ${mirror_array[0]} -o-1 $tf ||
+		error "mirror copy error"
 
 	# verify copying is successful by checking checksums
 	remount_client $MOUNT
 	for i in ${mirror_array[@]}; do
-		sum=$($LFS mirror dump -N $i $tf | md5sum)
+		sum=$($LFS mirror read -N $i $tf | md5sum)
 		[ "$sum" = "${checksums[1]}" ] ||
-			error "$i: mismatch checksum after copy"
+			error "$i: mismatch checksum after copy \'$sum\'"
 	done
 
 	rm -f $tf
 }
 run_test 37 "mirror I/O API verification"
 
-verify_flr_state()
-{
-	local tf=$1
-	local expected_state=$2
-
-	local state=$($LFS getstripe -v $tf | awk '/lcm_flags/{ print $2 }')
-	[ $expected_state = $state ] ||
-		error "expected: $expected_state, actual $state"
-}
-
 test_38() {
 	local tf=$DIR/$tfile
 	local ref=$DIR/${tfile}-ref
@@ -1379,7 +1556,7 @@ test_38() {
 
 	local valid_mirror stale_mirror id mirror_cksum
 	for id in "${mirror_array[@]}"; do
-		mirror_cksum=$($LFS mirror dump -N $id $tf | md5sum)
+		mirror_cksum=$($LFS mirror read -N $id $tf | md5sum)
 		[ "$ref_cksum" == "$mirror_cksum" ] &&
 			{ valid_mirror=$id; continue; }
 
@@ -1392,7 +1569,7 @@ test_38() {
 	mirror_io resync $tf || error "resync failed"
 	verify_flr_state $tf "ro"
 
-	mirror_cksum=$($LFS mirror dump -N $stale_mirror $tf | md5sum)
+	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
@@ -1518,7 +1695,7 @@ test_41() {
 
 	echo " **verify $tf-1 data consistency in all mirrors"
 	for i in 1 2 3; do
-		local sum=$($LFS mirror dump -N$i $tf-1 | md5sum)
+		local sum=$($LFS mirror read -N$i $tf-1 | md5sum)
 		[[ "$sum" = "$sum0" ]] ||
 			error "$tf-1.$i: checksum mismatch: $sum != $sum0"
 	done
@@ -1764,6 +1941,10 @@ test_44() {
 
 	verify_flr_state $tf "wp"
 
+	# disallow destroying the last non-stale mirror
+	! $LFS mirror delete --mirror-id 1 $tf > /dev/null 2>&1 ||
+		error "destroying mirror 1 should fail"
+
 	# synchronize all mirrors of the file
 	$LFS mirror resync $tf || error "mirror resync $tf failed"
 
@@ -1789,8 +1970,17 @@ test_44() {
 	verify_mirror_count $tf 2
 	verify_mirror_count $tf.mirror~2 1
 
+	$LFS setstripe --comp-set -I 0x30008 --comp-flags=stale $tf ||
+		error "setting stale flag on component 0x30008 failed"
+
+	# disallow destroying the last non-stale mirror
+	! $LFS mirror split --mirror-id 4 -d $tf > /dev/null 2>&1 ||
+		error "destroying mirror 4 should fail"
+
+	$LFS mirror resync $tf || error "resynchronizing $tf failed"
+
 	$LFS mirror split --mirror-id 3 -d $tf ||
-		error "split and delte mirror 3 failed"
+		error "destroying mirror 3 failed"
 	verify_mirror_count $tf 1
 
 	# verify splitted file contains the same content as the orig file does
@@ -1801,7 +1991,7 @@ test_44() {
 run_test 44 "lfs mirror split check"
 
 test_45() {
-	[ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs" && return
+	[ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs"
 
 	local file=$DIR/$tdir/$tfile
 	local dir=$DIR/$tdir/$dir
@@ -1813,16 +2003,14 @@ test_45() {
 		-N -E3m -S1m -Eeof -N -E8m -Eeof $file ||
 			error "Create $file failed"
 
-	echo "getstripe --yaml $file"
-	$LFS getstripe --yaml $file > $temp || error "getstripe $file failed"
-	echo "setstripe --yaml=$temp $file.2"
-	$LFS setstripe --yaml=$temp $file.2 || error "setstripe $file.2 failed"
+	verify_yaml_layout $file $file.copy $temp "1. FLR file"
+	rm -f $file $file.copy
 
-	echo "compare layout"
-	local layout1=$(get_layout_param $file)
-	local layout2=$(get_layout_param $file.2)
-	[ "$layout1" == "$layout2" ] ||
-		error "FLR file $file/$file.2 layouts are not equal"
+	$LFS setstripe -N -E1m -S1m -c2 -o0,1 -E2m -Eeof -N -E4m -Eeof \
+		-N -E3m -S1m -Eeof -N -E8m --flags=prefer -Eeof $file ||
+			error "Create $file failed"
+
+	verify_yaml_layout $file $file.copy $temp "2. FLR file with flags"
 }
 run_test 45 "Verify setstripe/getstripe with YAML with FLR file"
 
@@ -1969,6 +2157,9 @@ test_47() {
 run_test 47 "Verify mirror obj alloc"
 
 test_48() {
+	[ $MDS1_VERSION -lt $(version_code 2.11.55) ] &&
+		skip "Need MDS version at least 2.11.55"
+
 	local tf=$DIR/$tfile
 
 	rm -f $tf
@@ -1997,8 +2188,8 @@ test_48() {
 	verify_flr_state $tf "wp"
 	verify_comp_attr lcme_flags $tf 0x20003 nosync,stale
 
-	local sum1=$($LFS mirror dump -N1 $tf | md5sum)
-	local sum2=$($LFS mirror dump -N2 $tf | md5sum)
+	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"
@@ -2015,8 +2206,8 @@ test_48() {
 	verify_flr_state $tf "ro"
 	verify_comp_attr lcme_flags $tf 0x20003 nosync,^stale
 
-	sum1=$($LFS mirror dump -N1 $tf | md5sum)
-	sum2=$($LFS mirror dump -N2 $tf | md5sum)
+	sum1=$($LFS mirror read -N1 $tf | md5sum)
+	sum2=$($LFS mirror read -N2 $tf | md5sum)
 
 	echo " ** verify mirror 2 resync-ed"
 	echo "original checksum: $sum0"
@@ -2161,9 +2352,9 @@ test_200() {
 	mirror_io resync $tf
 	get_mirror_ids $tf
 
-	local csum=$($LFS mirror dump -N ${mirror_array[0]} $tf | md5sum)
+	local csum=$($LFS mirror read -N ${mirror_array[0]} $tf | md5sum)
 	for id in ${mirror_array[@]:1}; do
-		[ "$($LFS mirror dump -N $id $tf | md5sum)" = "$csum" ] ||
+		[ "$($LFS mirror read -N $id $tf | md5sum)" = "$csum" ] ||
 			error "checksum error for mirror $id"
 	done
 
@@ -2242,14 +2433,16 @@ test_202() {
 run_test 202 "lfs setstripe --add-component wide striping"
 
 test_203() {
-	[[ $OSTCOUNT -lt 2 ]] && skip "need >= 2 OSTs" && return
+	[ $MDS1_VERSION -lt $(version_code 2.11.55) ] &&
+		skip "Need MDS version at least 2.11.55"
+	[[ $OSTCOUNT -lt 2 ]] && skip "need >= 2 OSTs"
 
 	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 mirror delete --mirror-id=1 $tf || error "delete first mirror"
 
 	$LFS getstripe $tf
 	local old_id=$($LFS getstripe --mirror-id=2 -I $tf)
@@ -2274,6 +2467,405 @@ test_203() {
 }
 run_test 203 "mirror file preserve mirror ID"
 
+# Simple test of FLR + self-extending layout, SEL in non-primary mirror
+test_204a() {
+	[ "$MDS1_VERSION" -lt $(version_code $SEL_VER) ] &&
+		skip "skipped for lustre < $SEL_VER"
+
+	local comp_file=$DIR/$tdir/$tfile
+	local flg_opts=""
+	local found=""
+
+	test_mkdir $DIR/$tdir
+
+	# first mirror is 0-10M, then 10M-(-1), second mirror is 1M followed
+	# by extension space to -1
+	$LFS setstripe -N -E 10M -E-1 -N -E 1M -E-1 -z64M $comp_file ||
+		error "Create $comp_file failed"
+
+	# Write to first component, extending & staling second mirror
+	dd if=/dev/zero bs=2M count=1 of=$comp_file conv=notrunc ||
+		error "dd to extend + stale failed"
+
+	$LFS getstripe $comp_file
+
+	flg_opts="--component-flags init,stale"
+	found=$($LFS find --component-end 65M $flg_opts $comp_file | wc -l)
+	[ $found -eq 1 ] || error "write: Second comp end incorrect"
+
+	flg_opts="--component-flags extension"
+	found=$($LFS find --component-start 65M $flg_opts $comp_file | wc -l)
+	[ $found -eq 1 ] || error "write: Third comp start incorrect"
+
+	# mirror resync should not change the extents
+	$LFS mirror resync $comp_file
+
+	flg_opts="--component-flags init"
+	found=$($LFS find --component-end 65M $flg_opts $comp_file | wc -l)
+	[ $found -eq 1 ] || error "resync: Second comp end incorrect"
+
+	flg_opts="--component-flags extension"
+	found=$($LFS find --component-start 65M $flg_opts $comp_file | wc -l)
+	[ $found -eq 1 ] || error "resync: Third comp start incorrect"
+
+	sel_layout_sanity $comp_file 5
+
+	rm -f $comp_file
+}
+run_test 204a "FLR write/stale/resync tests with self-extending mirror"
+
+# Simple test of FLR + self-extending layout, SEL in primary mirror
+test_204b() {
+	[ "$MDS1_VERSION" -lt $(version_code $SEL_VER) ] &&
+		skip "skipped for lustre < $SEL_VER"
+
+	local comp_file=$DIR/$tdir/$tfile
+	local flg_opts=""
+	local found=""
+
+	test_mkdir $DIR/$tdir
+
+	# first mirror is 1M followed by extension space to -1, second mirror
+	# is 0-10M, then 10M-(-1),
+	$LFS setstripe -N -E 1M -E-1 -z64M -N -E 10M -E-1 $comp_file ||
+		error "Create $comp_file failed"
+
+	# Write to first component, extending first component & staling
+	# other mirror
+	dd if=/dev/zero bs=2M count=1 of=$comp_file conv=notrunc ||
+		error "dd to extend + stale failed"
+
+	$LFS getstripe $comp_file
+
+	flg_opts="--component-flags init"
+	found=$($LFS find --component-end 65M $flg_opts $comp_file | wc -l)
+	[ $found -eq 1 ] || error "write: First comp end incorrect"
+
+	flg_opts="--component-flags extension"
+	found=$($LFS find --component-start 65M $flg_opts $comp_file | wc -l)
+	[ $found -eq 1 ] || error "write: Second comp start incorrect"
+
+	flg_opts="--component-flags init,stale"
+	found=$($LFS find --component-end 10M $flg_opts $comp_file | wc -l)
+	[ $found -eq 1 ] || error "write: First mirror comp flags incorrect"
+
+	# This component is staled because it overlaps the extended first
+	# component of the primary mirror, even though it doesn't overlap
+	# the actual write - thus not inited.
+	flg_opts="--component-flags stale"
+	found=$($LFS find --component-start 10M $flg_opts $comp_file | wc -l)
+	[ $found -eq 1 ] || error "write: Second mirror comp flags incorrect"
+
+	# mirror resync should not change the extents
+	$LFS mirror resync $comp_file
+
+	$LFS getstripe $comp_file
+
+	flg_opts="--component-flags init"
+	found=$($LFS find --component-end 65M $flg_opts $comp_file | wc -l)
+	[ $found -eq 1 ] || error "resync: First comp end incorrect"
+
+	flg_opts="--component-flags extension"
+	found=$($LFS find --component-start 65M $flg_opts $comp_file | wc -l)
+	[ $found -eq 1 ] || error "resync: Second comp start incorrect"
+
+	flg_opts="--component-flags init"
+	found=$($LFS find --component-end 10M $flg_opts $comp_file | wc -l)
+	[ $found -eq 1 ] || error "resync: First mirror comp flags incorrect"
+
+	flg_opts="--component-flags init"
+	found=$($LFS find --component-start 10M $flg_opts $comp_file | wc -l)
+	[ $found -eq 1 ] || error "resync: Second mirror comp flags incorrect"
+
+	sel_layout_sanity $comp_file 5
+
+	rm -f $comp_file
+}
+run_test 204b "FLR write/stale/resync tests with self-extending primary"
+
+# FLR + SEL failed extension & component removal
+# extension space in second mirror
+test_204c() {
+	[ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs"
+	[ "$MDS1_VERSION" -lt $(version_code $SEL_VER) ] &&
+		skip "skipped for lustre < $SEL_VER"
+
+	local comp_file=$DIR/$tdir/$tfile
+	local found=""
+	local ost_idx1=0
+	local ost_name=$(ostname_from_index $ost_idx1)
+
+	test_mkdir $DIR/$tdir
+
+	# first mirror is is 0-10M, then 10M-(-1), second mirror is 0-1M, then
+	# extension space from 1M to 1G, then normal space to -1
+	$LFS setstripe -N -E 10M -E-1 -N -E 1M -E 1G -i $ost_idx1 -z 64M \
+		-E -1 $comp_file || error "Create $comp_file failed"
+
+	do_facet ost1 $LCTL set_param -n obdfilter.$ost_name.degraded=1
+	sleep_maxage
+
+	# write to first comp (0 - 10M) of mirror 1, extending + staling
+	# first + second comp of mirror 2
+	dd if=/dev/zero bs=2M count=1 of=$comp_file conv=notrunc
+	RC=$?
+
+	do_facet ost1 $LCTL set_param -n obdfilter.$ost_name.degraded=0
+	sleep_maxage
+
+	[ $RC -eq 0 ] || error "dd to extend + stale failed"
+
+	$LFS getstripe $comp_file
+
+	found=$($LFS find --component-start 0m --component-end 1m \
+		--comp-flags init,stale $comp_file | wc -l)
+	[ $found -eq 1 ] || error "write: First mirror comp incorrect"
+
+	found=$($LFS find --component-start 1m --component-end EOF \
+		--comp-flags stale,^init $comp_file | wc -l)
+	[ $found -eq 1 ] || error "write: Second mirror comp incorrect"
+
+	local mirror_id=$($LFS getstripe --component-start=1m	\
+			 --component-end=EOF $comp_file |	\
+			 grep lcme_mirror_id | awk '{ print $2 }')
+
+	[[ $mirror_id -eq 2 ]] ||
+		error "component not in correct mirror? $mirror_id"
+
+	$LFS mirror resync $comp_file
+
+	$LFS getstripe $comp_file
+
+	# component dimensions should not change from resync
+	found=$($LFS find --component-start 1m --component-end EOF \
+		--component-flags init $comp_file | wc -l)
+	[ $found -eq 1 ] || error "resync: Second mirror comp incorrect"
+
+	sel_layout_sanity $comp_file 4
+
+	rm -f $comp_file
+}
+run_test 204c "FLR write/stale/resync test with component removal"
+
+# Successful repeated component in primary mirror
+test_204d() {
+	[ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs"
+	[ "$MDS1_VERSION" -lt $(version_code $SEL_VER) ] &&
+		skip "skipped for lustre < $SEL_VER"
+
+	local comp_file=$DIR/$tdir/$tfile
+	local found=""
+
+	wait_delete_completed
+	wait_mds_ost_sync
+	test_mkdir $DIR/$tdir
+
+	# first mirror is 64M followed by extension space to -1, second mirror
+	# is 0-10M, then 10M-(-1)
+	$LFS setstripe -N -E-1 -z64M -N -E 10M -E-1 $comp_file ||
+		error "Create $comp_file failed"
+
+	local ost_idx1=$($LFS getstripe -I65537 -i $comp_file)
+	local ost_name=$(ostname_from_index $ost_idx1)
+	# degrade OST for first comp so we won't extend there
+	do_facet ost$((ost_idx1+1)) $LCTL set_param -n \
+		obdfilter.$ost_name.degraded=1
+	sleep_maxage
+
+	# Write beyond first component, causing repeat & stale second mirror
+	dd if=/dev/zero bs=1M count=1 seek=66 of=$comp_file conv=notrunc
+	RC=$?
+
+	do_facet ost$((ost_idx1+1)) $LCTL set_param -n \
+		obdfilter.$ost_name.degraded=0
+	sleep_maxage
+
+	[ $RC -eq 0 ] || error "dd to repeat & stale failed"
+
+	$LFS getstripe $comp_file
+
+	found=$($LFS find --component-start 64m --component-end 128m \
+		--component-flags init $comp_file | wc -l)
+	[ $found -eq 1 ] || error "write: Repeat comp incorrect"
+
+	local ost_idx2=$($LFS getstripe --component-start=64m		\
+			 --component-end=128m --component-flags=init	\
+			 -i $comp_file)
+	[[ $ost_idx1 -eq $ost_idx2 ]] && error "$ost_idx1 == $ost_idx2"
+	local mirror_id=$($LFS getstripe --component-start=64m		\
+			 --component-end=128m --component-flags=init	\
+			 $comp_file | grep lcme_mirror_id | awk '{ print $2 }')
+	[[ $mirror_id -eq 1 ]] ||
+		error "component not in correct mirror: $mirror_id, not 1"
+
+	$LFS mirror resync $comp_file
+
+	$LFS getstripe $comp_file
+
+	# component dimensions should not change from resync
+	found=$($LFS find --component-start 0m --component-end 64m \
+		--component-flags init $comp_file | wc -l)
+	[ $found -eq 1 ] || error "resync: first comp incorrect"
+	found=$($LFS find --component-start 64m --component-end 128m \
+		--component-flags init $comp_file | wc -l)
+	[ $found -eq 1 ] || error "resync: repeat comp incorrect"
+
+	sel_layout_sanity $comp_file 5
+
+	rm -f $comp_file
+}
+run_test 204d "FLR write/stale/resync sel test with repeated comp"
+
+# Successful repeated component, SEL in non-primary mirror
+test_204e() {
+	[ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs"
+	[ "$MDS1_VERSION" -lt $(version_code $SEL_VER) ] &&
+		skip "skipped for lustre < $SEL_VER"
+
+	local comp_file=$DIR/$tdir/$tfile
+	local found=""
+
+	wait_delete_completed
+	wait_mds_ost_sync
+
+	test_mkdir $DIR/$tdir
+
+	# first mirror is is 0-100M, then 100M-(-1), second mirror is extension
+	# space to -1 (-z 64M, so first comp is 0-64M)
+	# Note: we have to place both 1st components on OST0, otherwise 2 OSTs
+	# will be not enough - one will be degraded, the other is used on
+	# an overlapping mirror.
+	$LFS setstripe -N -E 100M -i 0 -E-1 -N -E-1 -i 0 -z 64M $comp_file ||
+		error "Create $comp_file failed"
+
+	local ost_idx1=$($LFS getstripe --component-start=0 \
+			 --component-end=64m -i $comp_file)
+	local ost_name=$(ostname_from_index $ost_idx1)
+	# degrade OST for first comp of 2nd mirror so we won't extend there
+	do_facet ost$((ost_idx1+1)) $LCTL set_param -n \
+		obdfilter.$ost_name.degraded=1
+	sleep_maxage
+
+	$LFS getstripe $comp_file
+
+	# Write to first component, stale & instantiate second mirror components
+	# overlapping with the written component (0-100M);
+	dd if=/dev/zero bs=2M count=1 of=$comp_file conv=notrunc
+	RC=$?
+
+	do_facet ost$((ost_idx1+1)) $LCTL set_param -n \
+		obdfilter.$ost_name.degraded=0
+	sleep_maxage
+	$LFS getstripe $comp_file
+
+	[ $RC -eq 0 ] || error "dd to repeat & stale failed"
+
+	found=$($LFS find --component-start 0m --component-end 64m \
+		--component-flags init,stale $comp_file | wc -l)
+	[ $found -eq 1 ] || error "write: first comp incorrect"
+
+	# was repeated due to degraded ost
+	found=$($LFS find --component-start 64m --component-end 128m \
+		--component-flags init,stale $comp_file | wc -l)
+	[ $found -eq 1 ] || error "write: repeated comp incorrect"
+
+	local ost_idx2=$($LFS getstripe --component-start=64m		\
+			 --component-end=128m --component-flags=init	\
+			 -i $comp_file)
+	[[ $ost_idx1 -eq $ost_idx2 ]] && error "$ost_idx1 == $ost_idx2"
+	local mirror_id=$($LFS getstripe --component-start=0m		\
+			 --component-end=64m --component-flags=init	\
+			 $comp_file | grep lcme_mirror_id | awk '{ print $2 }')
+	[[ $mirror_id -eq 2 ]] ||
+		error "component not in correct mirror? $mirror_id"
+
+	$LFS mirror resync $comp_file
+
+	$LFS getstripe $comp_file
+
+	# component dimensions should not change from resync
+	found=$($LFS find --component-start 0m --component-end 64m \
+		--component-flags init,^stale $comp_file | wc -l)
+	[ $found -eq 1 ] || error "resync: first comp incorrect"
+	found=$($LFS find --component-start 64m --component-end 128m \
+		--component-flags init,^stale $comp_file | wc -l)
+	[ $found -eq 1 ] || error "resync: repeated comp incorrect"
+
+	sel_layout_sanity $comp_file 5
+
+	rm -f $comp_file
+}
+run_test 204e "FLR write/stale/resync sel test with repeated comp"
+
+# FLR + SEL: failed repeated component, SEL in non-primary mirror
+test_204f() {
+	[ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs"
+	[ "$MDS1_VERSION" -lt $(version_code $SEL_VER) ] &&
+		skip "skipped for lustre < $SEL_VER"
+
+	local comp_file=$DIR/$tdir/$tfile
+	local found=""
+
+	wait_delete_completed
+	wait_mds_ost_sync
+	test_mkdir $DIR/$tdir
+
+	pool_add $TESTNAME || error "Pool creation failed"
+	pool_add_targets $TESTNAME 0 1 || error "Pool add targets failed"
+
+	# first mirror is is 0-100M, then 100M-(-1), second mirror is extension
+	# space to -1 (-z 64M, so first comp is 0-64M)
+	$LFS setstripe -N -E 100M -E-1 -N --pool="$TESTNAME" \
+		-E-1 -c 1 -z 64M $comp_file || error "Create $comp_file failed"
+
+	local ost_name0=$(ostname_from_index 0)
+	local ost_name1=$(ostname_from_index 1)
+
+	# degrade both OSTs in pool, so we'll try to repeat, then fail and
+	# extend original comp
+	do_facet ost1 $LCTL set_param -n obdfilter.$ost_name0.degraded=1
+	do_facet ost2 $LCTL set_param -n obdfilter.$ost_name1.degraded=1
+	sleep_maxage
+
+	# a write to the 1st component, 100M length, which will try to stale
+	# the first 100M of mirror 2, attempting to extend its 0-64M component
+	dd if=/dev/zero bs=2M count=1 of=$comp_file conv=notrunc
+	RC=$?
+
+	do_facet ost1 $LCTL set_param -n obdfilter.$ost_name0.degraded=0
+	do_facet ost2 $LCTL set_param -n obdfilter.$ost_name1.degraded=0
+	sleep_maxage
+
+	[ $RC -eq 0 ] || error "dd to extend mirror comp failed"
+
+	$LFS getstripe $comp_file
+
+	found=$($LFS find --component-start 0m --component-end 128m \
+		--component-flags init,stale $comp_file | wc -l)
+	[ $found -eq 1 ] || error "write: First mirror comp incorrect"
+
+	local mirror_id=$($LFS getstripe --component-start=0m		\
+			 --component-end=128m --component-flags=init	\
+			 $comp_file | grep lcme_mirror_id | awk '{ print $2 }')
+
+	[[ $mirror_id -eq 2 ]] ||
+		error "component not in correct mirror? $mirror_id, not 2"
+
+	$LFS mirror resync $comp_file
+
+	$LFS getstripe $comp_file
+
+	# component dimensions should not change from resync
+	found=$($LFS find --component-start 0m --component-end 128m \
+		--component-flags init,^stale $comp_file | wc -l)
+	[ $found -eq 1 ] || error "resync: First mirror comp incorrect"
+
+	sel_layout_sanity $comp_file 4
+
+	rm -f $comp_file
+}
+run_test 204f "FLR write/stale/resync sel w/forced extension"
+
 complete $SECONDS
 check_and_cleanup_lustre
 exit_status