b=22890 initialize MDSDEV in conf-sanity.sh

Initialize the MDSDEV variable in conf-sanity.sh.

i=grev
i=vladimir.saveliev

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 9ea4428..4704ff4 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -425,8 +425,8 @@ run_test 9 "test ptldebug and subsystem for mkfs"
 # LOGS/PENDING do not exist anymore since CMD3
 test_16() {
         local TMPMTPT="${TMP}/conf16"
 # LOGS/PENDING do not exist anymore since CMD3
 test_16() {
         local TMPMTPT="${TMP}/conf16"

-        local dev=${SINGLEMDS}_dev
-        local MDSDEV=${!dev}
+        local MDSDEV=$(mdsdevname ${SINGLEMDS//mds/})
+

         if [ ! -e "$MDSDEV" ]; then
             log "no $MDSDEV existing, so mount Lustre to create one"
            setup
         if [ ! -e "$MDSDEV" ]; then
             log "no $MDSDEV existing, so mount Lustre to create one"
            setup


@@ -459,8 +459,7 @@ test_16() {
 run_test 16 "verify that lustre will correct the mode of OBJECTS"
 
 test_17() {
 run_test 16 "verify that lustre will correct the mode of OBJECTS"
 
 test_17() {

-        local dev=${SINGLEMDS}_dev
-        local MDSDEV=${!dev}
+        local MDSDEV=$(mdsdevname ${SINGLEMDS//mds/})

 
         if [ ! -e "$MDSDEV" ]; then
             echo "no $MDSDEV existing, so mount Lustre to create one"
 
         if [ ! -e "$MDSDEV" ]; then
             echo "no $MDSDEV existing, so mount Lustre to create one"


@@ -481,8 +480,7 @@ run_test 17 "Verify failed mds_postsetup won't fail assertion (2936) (should ret
 test_18() {
         [ "$FSTYPE" != "ldiskfs" ] && skip "not needed for FSTYPE=$FSTYPE" && return
 
 test_18() {
         [ "$FSTYPE" != "ldiskfs" ] && skip "not needed for FSTYPE=$FSTYPE" && return
 

-        local dev=${SINGLEMDS}_dev
-        local MDSDEV=${!dev}
+        local MDSDEV=$(mdsdevname ${SINGLEMDS//mds/})

 
         local MIN=2000000
 
 
         local MIN=2000000
 


@@ -714,7 +712,10 @@ cleanup_24a() {
 test_24a() {
        #set up fs1
        gen_config
 test_24a() {
        #set up fs1
        gen_config

+

        #set up fs2
        #set up fs2

+       local MDSDEV=$(mdsdevname ${SINGLEMDS//mds/})
+

        [ -n "$ost1_HOST" ] && fs2ost_HOST=$ost1_HOST
        if [ -z "$fs2ost_DEV" -o -z "$fs2mds_DEV" ]; then
                do_facet $SINGLEMDS [ -b "$MDSDEV" ] && \
        [ -n "$ost1_HOST" ] && fs2ost_HOST=$ost1_HOST
        if [ -z "$fs2ost_DEV" -o -z "$fs2mds_DEV" ]; then
                do_facet $SINGLEMDS [ -b "$MDSDEV" ] && \


@@ -762,6 +763,8 @@ test_24a() {
 run_test 24a "Multiple MDTs on a single node"
 
 test_24b() {
 run_test 24a "Multiple MDTs on a single node"
 
 test_24b() {

+       local MDSDEV=$(mdsdevname ${SINGLEMDS//mds/})
+

        if [ -z "$fs2mds_DEV" ]; then
                do_facet $SINGLEMDS [ -b "$MDSDEV" ] && \
                skip_env "mixed loopback and real device not working" && return
        if [ -z "$fs2mds_DEV" ]; then
                do_facet $SINGLEMDS [ -b "$MDSDEV" ] && \
                skip_env "mixed loopback and real device not working" && return


@@ -1174,6 +1177,8 @@ run_test 32b "Upgrade from 1.8 with writeconf"
 test_33a() { # bug 12333, was test_33
         local rc=0
         local FSNAME2=test-123
 test_33a() { # bug 12333, was test_33
         local rc=0
         local FSNAME2=test-123

+        local MDSDEV=$(mdsdevname ${SINGLEMDS//mds/})
+

         [ -n "$ost1_HOST" ] && fs2ost_HOST=$ost1_HOST
 
         if [ -z "$fs2ost_DEV" -o -z "$fs2mds_DEV" ]; then
         [ -n "$ost1_HOST" ] && fs2ost_HOST=$ost1_HOST
 
         if [ -z "$fs2ost_DEV" -o -z "$fs2mds_DEV" ]; then


@@ -1383,6 +1388,7 @@ test_36() { # 12743
         local rc
         local FSNAME2=test1234
         local fs3ost_HOST=$ost_HOST
         local rc
         local FSNAME2=test1234
         local fs3ost_HOST=$ost_HOST

+        local MDSDEV=$(mdsdevname ${SINGLEMDS//mds/})

 
         [ -n "$ost1_HOST" ] && fs2ost_HOST=$ost1_HOST && fs3ost_HOST=$ost1_HOST
         rc=0
 
         [ -n "$ost1_HOST" ] && fs2ost_HOST=$ost1_HOST && fs3ost_HOST=$ost1_HOST
         rc=0


@@ -1495,8 +1501,7 @@ test_38() { # bug 14222
        log "rename lov_objid file on MDS"
        rm -f $TMP/lov_objid.orig
 
        log "rename lov_objid file on MDS"
        rm -f $TMP/lov_objid.orig
 

-       local dev=${SINGLEMDS}_dev
-       local MDSDEV=${!dev}
+       local MDSDEV=$(mdsdevname ${SINGLEMDS//mds/})

        do_facet $SINGLEMDS "$DEBUGFS -c -R \\\"dump lov_objid $TMP/lov_objid.orig\\\" $MDSDEV"
        do_facet $SINGLEMDS "$DEBUGFS -w -R \\\"rm lov_objid\\\" $MDSDEV"
 
        do_facet $SINGLEMDS "$DEBUGFS -c -R \\\"dump lov_objid $TMP/lov_objid.orig\\\" $MDSDEV"
        do_facet $SINGLEMDS "$DEBUGFS -w -R \\\"rm lov_objid\\\" $MDSDEV"
 


@@ -1557,8 +1562,7 @@ run_test 40 "race during service thread startup"
 
 test_41() { #bug 14134
         local rc
 
 test_41() { #bug 14134
         local rc

-        local dev=${SINGLEMDS}_dev
-        local MDSDEV=${!dev}
+        local MDSDEV=$(mdsdevname ${SINGLEMDS//mds/})

 
         start $SINGLEMDS $MDSDEV $MDS_MOUNT_OPTS -o nosvc -n
         start ost1 `ostdevname 1` $OST_MOUNT_OPTS
 
         start $SINGLEMDS $MDSDEV $MDS_MOUNT_OPTS -o nosvc -n
         start ost1 `ostdevname 1` $OST_MOUNT_OPTS