b=23439 fix some recovery debug messages

i=andrew

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index 0e7a610..919f1ea 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -1502,7 +1502,7 @@ static int check_for_next_transno(struct obd_device *obd)
         __u64 next_transno, req_transno;
 
         if (obd->obd_stopping) {
-                CDEBUG(D_HA, "waking for stooping device\n");
+                CDEBUG(D_HA, "waking for stopping device\n");
                 return 1;
         }
 
@@ -1537,9 +1537,10 @@ static int check_for_next_transno(struct obd_device *obd)
                 wake_up = 1;
         } else if (queue_len == obd->obd_recoverable_clients) {
                 CDEBUG(D_ERROR,
-                       "waking for skipped transno (skip: "LPD64
+                       "%s: waking for skipped transno (skip: "LPD64
                        ", ql: %d, comp: %d, conn: %d, next: "LPD64")\n",
-                       next_transno, queue_len, completed, max, req_transno);
+                       obd->obd_name, next_transno, queue_len, completed, max,
+                       req_transno);
                 obd->obd_next_recovery_transno = req_transno;
                 wake_up = 1;
         }
@@ -1669,7 +1670,8 @@ int target_queue_recovery_request(struct ptlrpc_request *req,
 
         if (target_exp_enqueue_req_replay(req)) {
                 spin_unlock_bh(&obd->obd_processing_task_lock);
-                DEBUG_REQ(D_ERROR, req, "dropping resent queued req");
+                DEBUG_REQ(D_ERROR, req, "%s: dropping resent queued req",
+                                        obd->obd_name);
                 RETURN(0);
         }
 
@@ -1687,8 +1689,9 @@ int target_queue_recovery_request(struct ptlrpc_request *req,
                 if (unlikely(lustre_msg_get_transno(reqiter->rq_reqmsg) ==
                              transno)) {
                         spin_unlock_bh(&obd->obd_processing_task_lock);
-                        DEBUG_REQ(D_ERROR, req, "dropping replay: transno "
-                                  "has been claimed by another client");
+                        DEBUG_REQ(D_ERROR, req, "%s: dropping replay: transno "
+                                  "has been claimed by another client",
+                                  obd->obd_name);
                         target_exp_dequeue_req_replay(req);
                         RETURN(0);
                 }

diff --git a/lustre/ldlm/ldlm_resource.c b/lustre/ldlm/ldlm_resource.c
index c31ae84..46a3666 100644 (file)
--- a/lustre/ldlm/ldlm_resource.c
+++ b/lustre/ldlm/ldlm_resource.c
@@ -857,8 +857,9 @@ ldlm_resource_add(struct ldlm_namespace *ns, struct ldlm_resource *parent,
                 OBD_FAIL_TIMEOUT(OBD_FAIL_LDLM_CREATE_RESOURCE, 2);
                 rc = ns->ns_lvbo->lvbo_init(res);
                 if (rc)
-                        CERROR("lvbo_init failed for resource "
-                               LPU64": rc %d\n", name.name[0], rc);
+                        CERROR("%s: lvbo_init failed for resource "
+                               LPU64": rc %d\n", ns->ns_name,
+                               name.name[0], rc);
                 /* we create resource with locked lr_lvb_sem */
                 up(&res->lr_lvb_sem);
         }