From bdaa1fb12fc83d96a81bcbaf4024486bbd4b7f70 Mon Sep 17 00:00:00 2001 From: zhanghc Date: Mon, 16 Nov 2009 01:27:06 +0000 Subject: [PATCH] b=16818 1, the test will be skipped if the MGS and OST1 are on the same node 2, the test will be interrupted if "zconf_mount $MOUNT2" failed i=nathan.rutman@sun.com i=robert.read@sun.com i=grev@sun.com --- lustre/ptlrpc/service.c | 4 ++-- lustre/tests/recovery-small.sh | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c index f1c21a2..60deefd 100644 --- a/lustre/ptlrpc/service.c +++ b/lustre/ptlrpc/service.c @@ -598,8 +598,8 @@ static void ptlrpc_update_export_timer(struct obd_export *exp, long extra_delay) exp->exp_obd->obd_eviction_timer = cfs_time_current_sec() + 3 * PING_INTERVAL; CDEBUG(D_HA, "%s: Think about evicting %s from %ld\n", - exp->exp_obd->obd_name, obd_export_nid2str(exp), - oldest_time); + exp->exp_obd->obd_name, + obd_export_nid2str(oldest_exp), oldest_time); } } else { if (cfs_time_current_sec() > diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh index 412fc8b..44c2aaa 100755 --- a/lustre/tests/recovery-small.sh +++ b/lustre/tests/recovery-small.sh @@ -686,6 +686,11 @@ test_26a() { # was test_26 bug 5921 - evict dead exports by pinger remote_ost_nodsh && skip "remote OST with nodsh" && return 0 remote_mds || { skip "local MDS" && return 0; } + if [ $(facet_host mgs) -eq $(facet_host ost1) ]; then + skip "mgs and ost1 are at the same node" + return 0 + fi + check_timeout || return 1 local OST_NEXP=$(do_facet ost1 lctl get_param -n obdfilter.${ost1_svc}.num_exports | cut -d' ' -f2) @@ -708,9 +713,15 @@ run_test 26a "evict dead exports" test_26b() { # bug 10140 - evict dead exports by pinger remote_ost_nodsh && skip "remote OST with nodsh" && return 0 + if [ $(facet_host mgs) -eq $(facet_host ost1) ]; then + skip "mgs and ost1 are at the same node" + return 0 + fi + check_timeout || return 1 client_df - zconf_mount `hostname` $MOUNT2 || error "Failed to mount $MOUNT2" + zconf_mount `hostname` $MOUNT2 || + { error "Failed to mount $MOUNT2"; return 2; } sleep 1 # wait connections being established local MDS_NEXP=$(do_facet mds lctl get_param -n mds.${mds_svc}.num_exports | cut -d' ' -f2) -- 1.8.3.1