run_test 21d "start mgs then ost and then mds"
test_22() {
- local num
-
start_mds
echo Client mount with ost in logs, but none running
start_ost
# wait until mds connected to ost and open client connection
- for num in $(seq 1 $MDSCOUNT); do
- wait_osc_import_state mds${num} ost FULL
- done
+ wait_osc_import_state mds ost FULL
stop_ost
mount_client $MOUNT
# check_mount will block trying to contact ost
sleep $((TIMEOUT + TIMEOUT + TIMEOUT))
fi
mount_client $MOUNT
- for num in $(seq 1 $MDSCOUNT); do
- wait_osc_import_state mds${num} ost FULL
- done
+ wait_osc_import_state mds ost FULL
wait_osc_import_state client ost FULL
check_mount || return 41
pass
test_25() {
set_cleanup_trap
- local dev=$(mdsdevname ${SINGLEMDS//mds/})
local POOL_ROOT=${POOL_ROOT:-$DIR/$tdir}
mkdir -p $POOL_ROOT
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
# fail abort so client will be new again
fail_abort $SINGLEMDS
client_up || error "reconnect failed"
- wait_osc_import_state mds ost FULL
+ wait_osc_import_state $SINGLEMDS ost FULL
return 0
}
run_test 29a "error adding new clients doesn't cause LBUG (bug 22273)"
echo $(( init_connect_timeout + at_min ))
}
-wait_osc_import_state() {
+_wait_osc_import_state() {
local facet=$1
local ost_facet=$2
local expected=$3
return 0
}
+wait_osc_import_state() {
+ local facet=$1
+ local ost_facet=$2
+ local expected=$3
+ local num
+
+ if [[ $facet = mds ]]; then
+ for num in $(seq $MDSCOUNT); do
+ _wait_osc_import_state mds$num "$ost_facet" "$expected"
+ done
+ else
+ _wait_osc_import_state "$facet" "$ost_facet" "$expected"
+ fi
+}
+
get_clientmdc_proc_path() {
echo "${1}-mdc-*"
}