LU-2662 build: pthread build issue

[fs/lustre-release.git] / lustre / tests / ost-pools.sh

diff --git a/lustre/tests/ost-pools.sh b/lustre/tests/ost-pools.sh
index ffa1506..c3a5609 100644 (file)
--- a/lustre/tests/ost-pools.sh
+++ b/lustre/tests/ost-pools.sh
@@ -29,7 +29,7 @@ init_logging
 
 check_and_setup_lustre
 
-[ "$SLOW" = "no" ] && EXCEPT_SLOW="23b"
+[ "$SLOW" = "no" ] && EXCEPT_SLOW="5b 18 22 23b 25"
 
 DIR=${DIR:-$MOUNT}
 assert_DIR
@@ -576,18 +576,18 @@ sub_test_5() {
     destroy_pool $POOL2
 }
 
-test_5() {
+test_5a() {
     set_cleanup_trap
     # Issue commands from client
-    sub_test_5 $LCTL
     sub_test_5 $LFS
+}
+run_test 5a "lfs pool_list from client"
 
-    # Issue commands from MDS
+test_5b() {
+    set_cleanup_trap
     sub_test_5 "do_facet $SINGLEMDS lctl"
-    sub_test_5 "do_facet $SINGLEMDS lfs"
-
 }
-run_test 5 "lfs/lctl pool_list"
+run_test 5b "lctl pool_list from MDS"
 
 test_6() {
     set_cleanup_trap
@@ -1388,7 +1388,6 @@ run_test 24 "Independence of pool from other setstripe parameters"
 
 test_25() {
     set_cleanup_trap
-    local dev=$(mdsdevname ${SINGLEMDS//mds/})
     local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
 
     mkdir -p $POOL_ROOT
@@ -1400,11 +1399,9 @@ test_25() {
             sort -u | tr '\n' ' ' " "$FSNAME-OST0000_UUID " >/dev/null ||
                 error "pool_add failed: $1; $2"
 
-        stop $SINGLEMDS || return 1
-        start $SINGLEMDS ${dev} $MDS_MOUNT_OPTS ||
-            { error "Failed to start $SINGLEMDS after stopping" && break; }
-        wait_osc_import_state mds ost FULL
-        clients_up
+       facet_failover $SINGLEMDS || error "failed to failover $SINGLEMDS"
+       wait_osc_import_state $SINGLEMDS ost FULL
+       clients_up
 
         wait_mds_ost_sync
         # Veriy that the pool got created and is usable