- put some asserts for debug

- remove unneeded debug message

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index b353a51..215c284 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -1175,7 +1175,7 @@ static int check_for_next_transno(struct obd_device *obd)
                 CDEBUG(D_HA, "waking for next ("LPD64")\n", next_transno);
                 wake_up = 1;
         } else if (queue_len + completed == max) {
-                LASSERT(lustre_msg_get_transno(req->rq_reqmsg) >= next_transno);
+                LASSERT(req_transno >= next_transno);
                 CDEBUG(req_transno > obd->obd_last_committed ? D_ERROR : D_HA,
                        "waking for skipped transno (skip: "LPD64
                        ", ql: %d, comp: %d, conn: %d, next: "LPD64")\n",
@@ -1370,6 +1370,7 @@ static int target_recovery_thread(void *arg)
                        obd->obd_max_recoverable_clients);
                 obd->obd_abort_recovery = 0;
                 stale = class_disconnect_stale_exports(obd, connect_done);
+                LASSERT(atomic_read(&obd->obd_req_replay_clients) >= stale);
                 atomic_sub(stale, &obd->obd_req_replay_clients);
                 atomic_sub(stale, &obd->obd_lock_replay_clients);
         }

diff --git a/lustre/mdt/mdt_recovery.c b/lustre/mdt/mdt_recovery.c
index 78c3db6..e3041f7 100644 (file)
--- a/lustre/mdt/mdt_recovery.c
+++ b/lustre/mdt/mdt_recovery.c
@@ -332,7 +332,7 @@ static int mdt_clients_data_init(const struct lu_env *env,
         /* When we do a clean MDS shutdown, we save the last_transno into
          * the header.  If we find clients with higher last_transno values
          * then those clients may need recovery done. */
-
+        LASSERT(atomic_read(&obd->obd_req_replay_clients) == 0);
         for (cl_idx = 0, off = msd->msd_client_start;
              off < last_size; cl_idx++) {
                 __u64 last_transno;

diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index 75d0392..cf497aa 100644 (file)
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -704,11 +704,6 @@ static int after_reply(struct ptlrpc_request *req)
 
                 /* Replay-enabled imports return commit-status information. */
                 if (lustre_msg_get_last_committed(req->rq_repmsg)) {
-                        if (imp->imp_peer_committed_transno >
-                                lustre_msg_get_last_committed(req->rq_repmsg))
-                                CERROR(" Import has "LPU64", receive "LPU64" committed\n",
-                                       imp->imp_peer_committed_transno, 
-                                       lustre_msg_get_last_committed(req->rq_repmsg));
                         imp->imp_peer_committed_transno =
                                 lustre_msg_get_last_committed(req->rq_repmsg);
                 }