From b14ca60ab547c6db548de5c374a9ef5d902f5b80 Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 21 Nov 2007 17:47:58 +0000 Subject: [PATCH] b=14236 i=adilger i=johann don't increase connect time on MGC --- lustre/obdclass/genops.c | 2 +- lustre/ptlrpc/import.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lustre/obdclass/genops.c b/lustre/obdclass/genops.c index 9d3d0ed..472088b 100644 --- a/lustre/obdclass/genops.c +++ b/lustre/obdclass/genops.c @@ -793,7 +793,7 @@ EXPORT_SYMBOL(class_import_put); static void init_imp_at(struct imp_at *at) { int i; - at_init(&at->iat_net_latency, CONNECTION_SWITCH_INC, 0); + at_init(&at->iat_net_latency, 0, 0); for (i = 0; i < IMP_AT_MAX_PORTALS; i++) { /* max service estimates are tracked on the server side, so don't use the AT history here, just use the last reported diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c index f85aa0e..3221c67 100644 --- a/lustre/ptlrpc/import.c +++ b/lustre/ptlrpc/import.c @@ -330,7 +330,8 @@ static int import_select_connection(struct obd_import *imp) we do finally connect. (FIXME: really we should wait for all network state associated with the last connection attempt to drain before trying to reconnect on it.) */ - if (tried_all && (imp->imp_conn_list.next == &imp_conn->oic_item)) { + if (tried_all && (imp->imp_conn_list.next == &imp_conn->oic_item) && + !imp->imp_recon_bk /* not retrying */) { if (at_get(&imp->imp_at.iat_net_latency) < CONNECTION_SWITCH_MAX) { at_add(&imp->imp_at.iat_net_latency, -- 1.8.3.1