LU-11743 utils: allow lctl pool_list on separate MGS

[fs/lustre-release.git] / lustre / tests / conf-sanity.sh

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 898c7ca..7b3f25a 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -6012,9 +6012,6 @@ cleanup_82b() {
        # Remove OSTs from a pool and destroy the pool.
        destroy_pool $ost_pool || true
 
-       if ! combined_mgs_mds ; then
-               umount_mgs_client
-       fi
        restore_ostindex
 }
 
@@ -6054,9 +6051,6 @@ test_82b() { # LU-4665
        done
 
        mount_client $MOUNT || error "mount client $MOUNT failed"
-       if ! combined_mgs_mds ; then
-               mount_mgs_client
-       fi
 
        wait_osts_up
        $LFS df $MOUNT || error "$LFS df $MOUNT failed"
@@ -7485,9 +7479,6 @@ test_103() {
        cp $LUSTRE/tests/test-framework.sh $DIR/$tdir ||
                error "(2) Fail to copy test-framework.sh"
 
-       if ! combined_mgs_mds ; then
-               mount_mgs_client
-       fi
        do_facet mgs $LCTL pool_new $FSNAME.pool1 ||
                error "(3) Fail to create $FSNAME.pool1"
        # name the pool name as the fsname
@@ -7499,9 +7490,6 @@ test_103() {
        $LFS setstripe -p $FSNAME $DIR/$tdir/d0 ||
                error "(6) Fail to setstripe on $DIR/$tdir/d0"
 
-       if ! combined_mgs_mds ; then
-               umount_mgs_client
-       fi
        KEEP_ZPOOL=true
        stopall
 
@@ -7511,9 +7499,6 @@ test_103() {
        FSNAME="mylustre"
        setupall
 
-       if ! combined_mgs_mds ; then
-               mount_mgs_client
-       fi
        test_103_check_pool $save_fsname 7
 
        if [ $OSTCOUNT -ge 2 ]; then
@@ -7522,9 +7507,6 @@ test_103() {
 
        $LFS setstripe -p $save_fsname $DIR/$tdir/f0 ||
                error "(16) Fail to setstripe on $DIR/$tdir/f0"
-       if ! combined_mgs_mds ; then
-               umount_mgs_client
-       fi
 
        stopall
 
@@ -7533,14 +7515,8 @@ test_103() {
        FSNAME="tfs"
        setupall
 
-       if ! combined_mgs_mds ; then
-               mount_mgs_client
-       fi
        test_103_check_pool $save_fsname 17
 
-       if ! combined_mgs_mds ; then
-               umount_mgs_client
-       fi
        stopall
 
        test_renamefs $save_fsname
@@ -8014,18 +7990,12 @@ test_109a()
        reformat
        setup_noconfig
        client_up || error "client_up failed"
-       #pool commands requires a client on MGS for procfs interfaces
-       if ! combined_mgs_mds ; then
-               mount_mgs_client
-               stack_trap umount_mgs_client EXIT
-       fi
 
        #
        # set number of permanent parameters
        #
        test_109_set_params $FSNAME
 
-       combined_mgs_mds || umount_mgs_client
        umount_client $MOUNT || error "umount_client failed"
        stop_ost || error "stop_ost failed"
        stop_mds || error "stop_mds failed"
@@ -8040,7 +8010,6 @@ test_109a()
                error "failed to clear client config"
 
        setup_noconfig
-       combined_mgs_mds || mount_mgs_client
 
        #
        # check that configurations are intact
@@ -8052,7 +8021,6 @@ test_109a()
        #
        destroy_test_pools || error "destroy test pools failed"
 
-       combined_mgs_mds || umount_mgs_client
        cleanup
 }
 run_test 109a "test lctl clear_conf fsname"
@@ -8068,18 +8036,12 @@ test_109b()
        reformat
        setup_noconfig
        client_up || error "client_up failed"
-       #pool commands requires a client on MGS for procfs interfaces
-       if ! combined_mgs_mds ; then
-               mount_mgs_client
-               stack_trap umount_mgs_client EXIT
-       fi
 
        #
        # set number of permanent parameters
        #
        test_109_set_params $FSNAME
 
-       combined_mgs_mds || umount_mgs_client
        umount_client $MOUNT || error "umount_client failed"
        stop_ost || error "stop_ost failed"
        stop_mds || error "stop_mds failed"
@@ -8094,7 +8056,6 @@ test_109b()
                error "failed to clear client config"
 
        setup_noconfig
-       combined_mgs_mds || mount_mgs_client
        #
        # check that configurations are intact
        #
@@ -8105,7 +8066,6 @@ test_109b()
        #
        destroy_test_pools || error "destroy test pools failed"
 
-       combined_mgs_mds || umount_mgs_client
        cleanup
 }
 run_test 109b "test lctl clear_conf one config"