From b4927482570ede923c208b847bef5acc7d1a2d7f Mon Sep 17 00:00:00 2001
From: alex <alex>
Date: Tue, 21 Jun 2005 06:16:47 +0000
Subject: [PATCH] - declare export non-connected in filter_init_server_data()
---
lustre/ldlm/ldlm_lib.c | 11 ++++++-----
lustre/obdfilter/filter.c | 1 +
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index a01334f5c2..119b0b23c6 100644
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -719,10 +719,9 @@ int target_handle_connect(struct ptlrpc_request *req)
/* Tell the client if we're in recovery. */
/* If this is the first client, start the recovery timer */
- CWARN("%s: connection from %s@%s/%lu %st"LPU64"\n", target->obd_name, cluuid.uuid,
- ptlrpc_peernid2str(&req->rq_peer, peer_str), *cfp,
- target->obd_recovering ? "recovering/" : "",
- conn_data->transno);
+ CWARN("%s: connection from %s@%s/%lu %st"LPU64"\n", target->obd_name,
+ cluuid.uuid, ptlrpc_peernid2str(&req->rq_peer, peer_str), *cfp,
+ target->obd_recovering ? "recovering/" : "", conn_data->transno);
if (target->obd_recovering) {
lustre_msg_add_op_flags(req->rq_repmsg, MSG_CONNECT_RECOVERING);
@@ -1352,7 +1351,9 @@ static int target_recovery_thread(void *arg)
/* If some clients haven't connected in time, evict them */
if (obd->obd_abort_recovery) {
int stale;
- CERROR("some clients haven't connect in time, evict them ...\n");
+ CERROR("some clients haven't connect in time (%d/%d),"
+ "evict them ...\n", obd->obd_connected_clients,
+ obd->obd_max_recoverable_clients);
obd->obd_abort_recovery = 0;
stale = class_disconnect_stale_exports(obd, connect_done, 0);
atomic_sub(stale, &obd->obd_req_replay_clients);
diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index f9bf6fc681..1f9aa77e36 100644
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -500,6 +500,7 @@ static int filter_init_server_data(struct obd_device *obd, struct file * filp)
spin_lock_init(&fed->fed_lock);
fcd = NULL;
+ exp->exp_connected = 0;
exp->exp_req_replay_needed = 1;
exp->exp_lock_replay_needed = 1;
atomic_inc(&obd->obd_req_replay_clients);
--
GitLab