diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index a01334f5c20935ecf0a32ccbd3d540ffe57597c8..119b0b23c64d5cfb6691b2eb80fe9df7bef0cdb7 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 f9bf6fc68132fc5c51cc2ddcf9c63c0974322a48..1f9aa77e366e4827aab9e2d10a1e73879ed1572c 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);