From 029a6a8eac9f22c943328bbd958c5fe3ca915f90 Mon Sep 17 00:00:00 2001 From: "robert.read" Date: Thu, 2 Apr 2009 00:04:57 +0000 Subject: [PATCH] Branch HEAD b=18554 Reverting change. A different, seemingly unrelated bug is ocurring since landing this, and removing this for further review. --- lustre/lov/lov_obd.c | 5 +++++ lustre/tests/replay-single.sh | 13 ------------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c index 38f921d..e51b0e2 100644 --- a/lustre/lov/lov_obd.c +++ b/lustre/lov/lov_obd.c @@ -201,6 +201,11 @@ int lov_connect_obd(struct obd_device *obd, __u32 index, int activate, } lov->lov_tgts[index]->ltd_reap = 0; + if (activate) { + lov->lov_tgts[index]->ltd_active = 1; + lov->desc.ld_active_tgt_count++; + lov->lov_tgts[index]->ltd_exp->exp_obd->obd_inactive = 0; + } CDEBUG(D_CONFIG, "Connected tgt idx %d %s (%s) %sactive\n", index, obd_uuid2str(&tgt_uuid), tgt_obd->obd_name, activate ? "":"in"); diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh index 4521ad9..3fd3517 100755 --- a/lustre/tests/replay-single.sh +++ b/lustre/tests/replay-single.sh @@ -1898,19 +1898,6 @@ test_73c() { } run_test 73c "open(O_CREAT), unlink, replay, reconnect at last_replay, close" -# bug 18554 -test_74() { - stop ost1 - zconf_umount $(hostname) $MOUNT - fail $SINGLEMDS - zconf_mount $(hostname) $MOUNT - mount_facet ost1 - touch $DIR/$tfile || return 1 - rm $DIR/$tfile || return 2 - return 0 -} -run_test 74 "Ensure applications don't fail waiting for OST reocvery" - test_80a() { [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return 0 -- 1.8.3.1