From: Andreas Dilger <adilger@whamcloud.com>
Date: Fri, 28 Jun 2019 09:58:32 +0000 (-0600)
Subject: LU-11546 tests: enable large_dir support for tests
X-Git-Tag: 2.12.58~22
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=5a02d431f4a0a80915afa19c065df29c61e26ec9

LU-11546 tests: enable large_dir support for tests

Enable the ldiskfs large_dir feature by default for all test
filesystems, so that we can verify it is not causing any issues
in regular testing.  If this is successful, it can be enabled
in mkfs.lustre permanently.

Existing conf-sanity.sh test_110() and test_111() exercise this
feature specifically, this patch is to ensure other tests have
no problems with this feature enabled.  There are other problems
with test_110() so it cannot be enabled at this time.

Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: Ifff578551b57b05753fc10abb2d5294730254035
Reviewed-on: https://review.whamcloud.com/35358
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Artem Blagodarenko <artem.blagodarenko@gmail.com>
Reviewed-by: James Nunez <jnunez@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 94dc4e5..e1e7365 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -8149,11 +8149,13 @@ test_110()
 	combined_mgs_mds || replace=" --replace "
 	local opts="$(mkfs_opts mds1 $(mdsdevname 1)) \
 		    $replace --reformat $(mdsdevname 1) $(mdsvdevname 1)"
-	if [[ $opts != *mkfsoptions* ]]; then
-		opts+=" --mkfsoptions=\\\"-O large_dir -b 1024 -i 65536\\\""
-	else
-		opts="${opts//--mkfsoptions=\\\"/ \
-			--mkfsoptions=\\\"-O large_dir -b 1024 -i 65536 }"
+	if [[ $opts != *large_dir* ]]; then
+		if [[ $opts != *mkfsoptions* ]]; then
+			opts+=" --mkfsoptions=\\\"-O large_dir -b 1024 -i 65536\\\""
+		else
+			opts="${opts//--mkfsoptions=\\\"/ \
+				--mkfsoptions=\\\"-O large_dir -b 1024 -i 65536 }"
+		fi
 	fi
 	echo "MDT params: $opts"
 	load_modules
@@ -8164,11 +8166,13 @@ test_110()
 	opts="$(mkfs_opts ost1 $(ostdevname 1)) \
 		$replace --reformat $(ostdevname 1) $(ostvdevname 1)"
 
-	if [[ $opts != *mkfsoptions* ]]; then
-		opts+=" --mkfsoptions=\\\"-O large_dir\\\" "
-	else
-		opts="${opts//--mkfsoptions=\\\"/ \
-			--mkfsoptions=\\\"-O large_dir }"
+	if [[ $opts != *large_dir* ]]; then
+		if [[ $opts != *mkfsoptions* ]]; then
+			opts+=" --mkfsoptions=\\\"-O large_dir\\\" "
+		else
+			opts="${opts//--mkfsoptions=\\\"/ \
+				--mkfsoptions=\\\"-O large_dir }"
+		fi
 	fi
 	echo "OST params: $opts"
 	add ost1 $opts || error "add ost1 failed with new params"
@@ -8236,11 +8240,13 @@ test_111() {
 	combined_mgs_mds || replace=" --replace "
 	local opts="$(mkfs_opts mds1 $(mdsdevname 1)) \
 		    $replace --reformat $(mdsdevname 1) $(mdsvdevname 1)"
-	if [[ $opts != *mkfsoptions* ]]; then
-		opts+=" --mkfsoptions=\\\"-O large_dir -i 1048576 \\\" "
-	else
-		opts="${opts//--mkfsoptions=\\\"/ \
-			--mkfsoptions=\\\"-O large_dir -i 1048576 }"
+	if [[ $opts != *large_dir* ]]; then
+		if [[ $opts != *mkfsoptions* ]]; then
+			opts+=" --mkfsoptions=\\\"-O large_dir -i 1048576 \\\" "
+		else
+			opts="${opts//--mkfsoptions=\\\"/ \
+				--mkfsoptions=\\\"-O large_dir -i 1048576 }"
+		fi
 	fi
 	echo "MDT params: $opts"
 	load_modules
@@ -8251,10 +8257,12 @@ test_111() {
 
 	opts="$(mkfs_opts ost1 $(ostdevname 1)) \
 		$replace --reformat $(ostdevname 1) $(ostvdevname 1)"
-	if [[ $opts != *mkfsoptions* ]]; then
-		opts+=" --mkfsoptions=\\\"-O large_dir \\\""
-	else
-		opts="${opts//--mkfsoptions=\\\"/ --mkfsoptions=\\\"-O large_dir }"
+	if [[ $opts != *large_dir* ]]; then
+		if [[ $opts != *mkfsoptions* ]]; then
+			opts+=" --mkfsoptions=\\\"-O large_dir \\\""
+		else
+			opts="${opts//--mkfsoptions=\\\"/ --mkfsoptions=\\\"-O large_dir }"
+		fi
 	fi
 	echo "OST params: $opts"
 	__touch_device ost 1
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index bcb0c8e..24a6081 100755
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -4516,7 +4516,7 @@ mkfs_opts() {
 		opts+=${L_GETIDENTITY:+" --param=mdt.identity_upcall=$L_GETIDENTITY"}
 
 		if [ $fstype == ldiskfs ]; then
-			fs_mkfs_opts+="-O ea_inode"
+			fs_mkfs_opts+="-O ea_inode,large_dir"
 
 			var=${facet}_JRN
 			if [ -n "${!var}" ]; then