b=6403

 - remove ugly debug bits
 - dump FL_REPLAY reqs once after connect to avoid flooding

diff --git a/lustre/include/linux/lustre_import.h b/lustre/include/linux/lustre_import.h
index 716028d..8164f77 100644 (file)
--- a/lustre/include/linux/lustre_import.h
+++ b/lustre/include/linux/lustre_import.h
@@ -102,7 +102,8 @@ struct obd_import {
                                   imp_initial_recov:1, imp_force_verify:1,
                                   imp_pingable:1, imp_resend_replay:1,
                                   imp_deactive:1,
-                                  imp_waiting_ping_reply:1;
+                                  imp_waiting_ping_reply:1,
+                                  imp_debug_open_replays:1;
         __u32                     imp_connect_op;
         __u32                     imp_connect_flags;
         struct obd_connect_data   imp_connect_data;

diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index 349e218..4269bc5 100644 (file)
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -1215,22 +1215,9 @@ void ptlrpc_free_committed(struct obd_import *imp)
                 }
 
                 if (req->rq_replay) {
-#warning "REMOVE THIS CRAP ONCE 6403 SOLVED -bzzz"
-                        struct mdc_open_data {
-                                struct obd_client_handle *mod_och;
-                                struct ptlrpc_request    *mod_open_req;
-                                struct ptlrpc_request    *mod_close_req;
-                        };
-                        struct mdc_open_data *mod = req->rq_cb_data;
-                        if (mod == NULL || mod->mod_close_req == NULL) {
+                        /* this is debug flag to avoid flooding of logs -bzzz */
+                        if (imp->imp_debug_open_replays)
                                 DEBUG_REQ(D_HA, req, "keeping (FL_REPLAY)");
-                                continue;
-                        }
-                        DEBUG_REQ(D_HA, req, "keeping (FL_REPLAY), "
-                                  "closed by x"LPD64"/t"LPD64,
-                                  mod->mod_close_req->rq_xid,
-                                  mod->mod_close_req->rq_repmsg ?
-                                  mod->mod_close_req->rq_repmsg->transno : 0);
                         continue;
                 }
 
@@ -1248,6 +1235,7 @@ free_req:
                 list_del_init(&req->rq_replay_list);
                 __ptlrpc_req_finished(req, 1);
         }
+        imp->imp_debug_open_replays = 0;
 
         EXIT;
         return;

diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index 069a427..78c79b4 100644 (file)
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -551,6 +551,7 @@ static int ptlrpc_connect_interpret(struct ptlrpc_request *request,
         }
 
 finish:
+        imp->imp_debug_open_replays = 1;
         rc = ptlrpc_import_recovery_state_machine(imp);
         if (rc != 0) {
                 if (rc == -ENOTCONN) {