X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-pfl.sh;h=36c72bdf4f7813045226a8eef31169ce01466541;hp=387d2b294127d4e493fab144c6dbbd94cf229136;hb=48f8978e6e7571ef6c9772ab82a40ed5466bc0b7;hpb=c7774c25247a606748b02f46fc866abaf2d4930c

diff --git a/lustre/tests/sanity-pfl.sh b/lustre/tests/sanity-pfl.sh
index 387d2b2..36c72bd 100644
--- a/lustre/tests/sanity-pfl.sh
+++ b/lustre/tests/sanity-pfl.sh
@@ -129,6 +129,9 @@ test_0c() {
 run_test 0c "Verify SEL comp stripe count limits"
 
 test_0d() {
+	(( $MDS1_VERSION > $(version_code 2.14.50.115) )) ||
+		skip_env "Need MDS version at least 2.14.50.115"
+
 	local td=$DIR/$tdir
 	local tf=$td/$tfile
 	local comp_end
@@ -1014,6 +1017,37 @@ test_16c() {
 }
 run_test 16c "Verify setstripe/getstripe for SEL layout with YAML config file"
 
+test_16d() {
+	[ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs"
+
+	local file=$DIR/$tdir/$tfile
+	local dir=$DIR/$tdir/dir
+	local temp=$DIR/$tdir/template
+	rm -rf $DIR/$tdir
+	test_mkdir $DIR/$tdir
+
+	#####################################################################
+	#                           1. DOM file
+	# set stripe for source file
+	$LFS setstripe -E1m -L mdt -E-1 -o1,0 $file ||
+		error "Create $file failed"
+
+	echo "1. DOM file"
+	verify_yaml_layout $file $file.copy $temp "1. DOM file"
+
+	#####################################################################
+	#                           2. DOM dir
+	# set stripe for source dir
+	test_mkdir $dir
+	$LFS setstripe -E1m -L mdt -E-1 -o1,0 $dir || error "Create $dir failed"
+
+	test_mkdir $dir.copy
+	echo "2. DOM dir"
+	verify_yaml_layout $dir $dir.copy $temp.dir "2. DOM dir"
+}
+run_test 16d "Verify setstripe/getstripe for DOM layout with YAML config file"
+
+
 test_17() {
 	[ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs"
 	local file=$DIR/$tdir/$tfile
@@ -2398,6 +2432,53 @@ test_24a() {
 }
 run_test 24a "FIEMAP upon PFL file"
 
+test_25() {
+	local pfl_f=$DIR/$tdir/"$tfile"_pfl
+	local dom_f=$DIR/$tdir/"$tfile"_dom
+	local common_f=$DIR/$tdir/"$tfile"_common
+	local stripe_count
+	local stripe_size
+
+	mkdir -p $DIR/$tdir || error "mkdir $DIR/$tdir failed"
+	$LFS setstripe -E 10M -S 64k -c -1 -E 20M -S 1M -E -1 -S 2M -c 1 \
+		$pfl_f || error "setstripe $pfl_f failed"
+	$LFS setstripe -E 256k -L mdt -E -1 -S 1M $dom_f ||
+		error "setstripe $dom_f failed"
+	$LFS setstripe -S 512K -c -1 $common_f ||
+		error "setstripe $common_f failed"
+
+	#verify lov_getstripe_old with PFL file
+	stripe_count=$(lov_getstripe_old $pfl_f |
+			awk '/stripe_count/ { print $2 }')
+	stripe_size=$(lov_getstripe_old $pfl_f |
+			awk '/stripe_size/ { print $2 }')
+	[ $stripe_count -eq 1 ] ||
+		error "stripe_count $stripe_count !=1 for $pfl_f"
+	[ $stripe_size -eq 2097152 ] ||
+		error "stripe_size $stripe_size != 2097152 for $pfl_f"
+
+	#verify lov_getstripe_old with DoM file
+	stripe_count=$(lov_getstripe_old $dom_f |
+			awk '/stripe_count/ { print $2 }')
+	stripe_size=$(lov_getstripe_old $dom_f |
+			awk '/stripe_size/ { print $2 }')
+	[ $stripe_count -eq 1 ] ||
+		error "stripe_count $stripe_count !=1 for $dom_f"
+	[ $stripe_size -eq 1048576 ] ||
+		error "stripe_size $stripe_size != 1048576 for $dom_f"
+
+	#verify lov_getstripe_old with common file
+	stripe_count=$(lov_getstripe_old $common_f |
+			awk '/stripe_count/ { print $2 }')
+	stripe_size=$(lov_getstripe_old $common_f |
+			awk '/stripe_size/ { print $2 }')
+	[ $stripe_count -eq $OSTCOUNT ] ||
+		error "stripe_count $stripe_count !=$OSTCOUNT for $common_f"
+	[ $stripe_size -eq 524288 ] ||
+		error "stripe_size $stripe_size != 524288 for $common_f"
+}
+run_test 25 "Verify old lov stripe API with PFL files"
+
 complete $SECONDS
 check_and_cleanup_lustre
 exit_status