LU-3009 tests: failure on conf-sanity test_17

Test 17 is failing due to the failure of the debugfs command
in this subtest.  The command fails because MGSDEV is undefined.
Using an alternative that is available in the current test framework.

Signed-off-by: Bob Glossman <bob.glossman@intel.com>
Change-Id: I93407dd3c349d91a2ea4690b70dd67c68d65582c
Reviewed-on: http://review.whamcloud.com/5816
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Minh Diep <minh.diep@intel.com>
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index c752454..f2f7417 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -603,24 +603,25 @@ test_17() {
                return
        fi
 
-        setup
-        check_mount || return 41
-        cleanup || return $?
+       setup
+       check_mount || return 41
+       cleanup || return $?
 
-        echo "Remove mds config log"
-        if ! combined_mgs_mds ; then
-                stop mgs
-        fi
+       echo "Remove mds config log"
+       if ! combined_mgs_mds ; then
+               stop mgs
+       fi
 
-        do_facet mgs "$DEBUGFS -w -R 'unlink CONFIGS/$FSNAME-MDT0000' $MGSDEV || return \$?" || return $?
+       do_facet mgs "$DEBUGFS -w -R 'unlink CONFIGS/$FSNAME-MDT0000' \
+               $(mgsdevname) || return \$?" || return $?
 
-        if ! combined_mgs_mds ; then
-                start_mgs
-        fi
+       if ! combined_mgs_mds ; then
+               start_mgs
+       fi
 
-        start_ost
-        start_mds && return 42
-        reformat_and_config
+       start_ost
+       start_mds && return 42
+       reformat_and_config
 }
 run_test 17 "Verify failed mds_postsetup won't fail assertion (2936) (should return errs)"