b=3633,3934

debugging

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index 482124d..d86e892 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -895,8 +895,10 @@ static int target_recovery_thread(void *arg)
                 LASSERT(trd->trd_processing_task == current->pid);
                 req = target_next_replay_req(obd);
                 if (req != NULL) {
-                        DEBUG_REQ(D_HA, req, "processing t"LPD64" : ", 
-                                  req->rq_reqmsg->transno);
+                        char peer_str[PTL_NALFMT_SIZE];
+                        DEBUG_REQ(D_HA, req, "processing t"LPD64" from %s: ", 
+                                  req->rq_reqmsg->transno, 
+                                  ptlrpc_peernid2str(&req->rq_peer, peer_str));
                         (void)trd->trd_recovery_handler(req);
                         obd->obd_replayed_requests++;
                         reset_recovery_timer(obd);

diff --git a/lustre/mds/mds_open.c b/lustre/mds/mds_open.c
index 510d844..b655122 100644 (file)
--- a/lustre/mds/mds_open.c
+++ b/lustre/mds/mds_open.c
@@ -841,8 +841,10 @@ int mds_open(struct mds_update_record *rec, int offset,
          * opened this file and is only replaying the RPC, so we open the
          * inode by fid (at some large expense in security). */
         if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) {
-                DEBUG_REQ(D_HA, req, "open replay, disp: "LPX64"\n",
-                          rep->lock_policy_res1);
+                DEBUG_REQ(D_HA, req, "open replay");
+                CDEBUG(D_HA, "open fid "LPU64"/%u name %*s mode %o\n",
+                          rec->ur_fid2->id, rec->ur_fid2->generation,
+                          rec->ur_namelen - 1, rec->ur_name, rec->ur_mode);
 
                 LASSERT(rec->ur_fid2->id);
 

diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c
index a606914..d2e5661 100644 (file)
--- a/lustre/mds/mds_reint.c
+++ b/lustre/mds/mds_reint.c
@@ -131,7 +131,7 @@ int mds_finish_transno(struct mds_obd *mds, struct inode *inode, void *handle,
 
         transno = req->rq_reqmsg->transno;
         if (rc != 0) {
-                LASSERTF(transno == 0, "BUG 3934, t"LPU64" rc %d,", transno, rc);
+                LASSERTF(transno == 0, "BUG 3934, t"LPU64" rc %d\n", transno, rc);
         } else if (transno == 0) {
                 spin_lock(&mds->mds_transno_lock);
                 transno = ++mds->mds_last_transno;