From ac6fe1d9e788b4081e8c7e05be9dbbae8b797eb8 Mon Sep 17 00:00:00 2001 From: adilger Date: Tue, 10 Feb 2004 00:21:17 +0000 Subject: [PATCH] Fix mkfsoptions support for osts. b=2603, b=2604 --- lustre/ChangeLog | 1 + lustre/tests/conf-sanity.sh | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lustre/ChangeLog b/lustre/ChangeLog index c89792f..7949eec 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -28,6 +28,7 @@ tbd Cluster File Systems, Inc. - print out dotted-quad IP addresses in the socknal (2302) * miscellania - additional debugging for MDS client eviction problem (2443) + - fix mkfsoptions support for osts (2603, 2604) 2004-01-27 Cluster File Systems, Inc. * version 1.0.3 diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 6d3b313..e253076 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -472,13 +472,13 @@ test_14() { add_lov lov1 mds --stripe_sz $STRIPE_BYTES\ --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0 add_ost ost --lov lov1 --dev $OSTDEV --size $OSTSIZE \ - --mkfsoptions -V + --mkfsoptions "-Llabel_conf_15" add_client client mds --lov lov1 --path $MOUNT FOUNDSTRING=`awk -F"<" '//{print $2}' $XMLCONFIG` - EXPECTEDSTRING="mkfsoptions>-V" + EXPECTEDSTRING="mkfsoptions>-Llabel_conf_15" if [ $EXPECTEDSTRING != $FOUNDSTRING ]; then - echo "Error:expected string: $EXPECTEDSTRING; found: $FOUNDSTRING" + echo "Error: expected: $EXPECTEDSTRING; found: $FOUNDSTRING" return 1 fi echo "Success:mkfsoptions for ost written to xml file correctly." @@ -488,8 +488,12 @@ test_14() { start_ost start_mds mount_client $MOUNT || return $? + if [ -z "`dumpe2fs -h $OSTDEV | grep label_conf_15`" ]; then + echo "Error: the mkoptions not applied to mke2fs of ost." + return 1 + fi cleanup - echo "lconf mkfsoptions-parsing for ost success" + echo "lconf mkfsoptions for ost success" gen_config } -- 1.8.3.1