From 0496d8c1177907df0928e35a3cd76f641e911931 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Thu, 12 Jan 2012 10:00:06 -0500 Subject: [PATCH] LU-915 tests: MKFSOPTS fix for test suite While testing LU-80 I had to provide my own MKFSOPT string for the mkfsoptions in local.sh. In the conf-sanity test the MKFSOPT provided were totally replaced by a new MKFSOPT that contained only lazy_itable_init. This prevented me from running any conf-sanity test bacause I couldn't format the MDS. This patch instead appends lazy_itable_init to the mkfsoptions string if it already exist. Change-Id: If30d2a692431dcdb3631fc9c1e77da5ff2792881 Signed-off-by: James Simmons Reviewed-on: http://review.whamcloud.com/1830 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Minh Diep Reviewed-by: Cliff White Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 6b3b646..da81213 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -54,8 +54,12 @@ for facet in MGS MDS OST; do opts=${facet}_MKFS_OPTS if [[ ${!opts} != *lazy_itable_init* ]]; then eval SAVED_${facet}_MKFS_OPTS=\"${!opts}\" - eval ${facet}_MKFS_OPTS=\"${!opts} \ ---mkfsoptions='\\\"-E lazy_itable_init\\\"'\" + if [[ ${!opts} != *mkfsoptions* ]]; then + eval ${facet}_MKFS_OPTS=\"${!opts} --mkfsoptions='\\\"-E lazy_itable_init\\\"'\" + else + val=${!opts//--mkfsoptions=\\\"/--mkfsoptions=\\\"-E lazy_itable_init } + eval ${facet}_MKFS_OPTS='${val}' + fi fi done -- 1.8.3.1