From: bobijam <bobijam>
Date: Fri, 6 Mar 2009 02:21:01 +0000 (+0000)
Subject: Branch b18
X-Git-Tag: v1_8_0_110~215
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=b72e2618992194a1d20babe81da50190545f18c0;p=fs%2Flustre-release.git

Branch b18
b=17682
i=johann
i=vitaly.fertman

Improve debug info for OSS.
---

diff --git a/lustre/include/obd.h b/lustre/include/obd.h
index 9d69656..242f92d 100644
--- a/lustre/include/obd.h
+++ b/lustre/include/obd.h
@@ -1312,7 +1312,7 @@ static inline void obd_transno_commit_cb(struct obd_device *obd, __u64 transno,
                 return;
         }
         if (exp && transno > exp->exp_last_committed) {
-                CDEBUG(D_HA, "%s: transno "LPU64" committed\n",
+                CDEBUG(D_INFO, "%s: transno "LPU64" committed\n",
                        obd->obd_name, transno);
                 exp->exp_last_committed = transno;
                 ptlrpc_commit_replies(exp);
diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c
index 7fb6c0d..50364e6 100644
--- a/lustre/ost/ost_handler.c
+++ b/lustre/ost/ost_handler.c
@@ -509,6 +509,10 @@ static int ost_prolong_locks_iter(struct ldlm_lock *lock, void *data)
                 return LDLM_ITER_CONTINUE;
         }
 
+        CDEBUG(D_DLMTRACE,"refresh lock: "LPU64"/"LPU64" ("LPU64"->"LPU64")\n",
+               lock->l_resource->lr_name.name[0],
+               lock->l_resource->lr_name.name[1],
+               opd->opd_policy.l_extent.start, opd->opd_policy.l_extent.end);
         /* OK. this is a possible lock the user holds doing I/O
          * let's refresh eviction timer for it */
         ldlm_refresh_waiting_lock(lock, opd->opd_timeout);
@@ -541,7 +545,7 @@ static int ost_rw_prolong_locks(struct ptlrpc_request *req, struct obd_ioobj *ob
                           max(at_est2timeout(at_get(&req->rq_rqbd->
                               rqbd_service->srv_at_estimate)), ldlm_timeout);
 
-        CDEBUG(D_DLMTRACE,"refresh locks: "LPU64"/"LPU64" ("LPU64"->"LPU64")\n",
+        CDEBUG(D_INFO,"refresh locks: "LPU64"/"LPU64" ("LPU64"->"LPU64")\n",
                res_id.name[0], res_id.name[1], opd.opd_policy.l_extent.start,
                opd.opd_policy.l_extent.end);
 
@@ -1125,7 +1129,7 @@ static int ost_set_info(struct obd_export *exp, struct ptlrpc_request *req)
         if (KEY_IS(KEY_GRANT_SHRINK)) {
                 rc = lustre_pack_reply(req, 2, size, NULL);
                 if (rc)
-                        RETURN(rc); 
+                        RETURN(rc);
         } else {
                 rc = lustre_pack_reply(req, 1, NULL, NULL);
                 if (rc)
@@ -1134,19 +1138,19 @@ static int ost_set_info(struct obd_export *exp, struct ptlrpc_request *req)
 
         vallen = lustre_msg_buflen(req->rq_reqmsg, REQ_REC_OFF + 1);
         if (vallen) {
-                if (KEY_IS(KEY_GRANT_SHRINK)) { 
-                        body = lustre_swab_reqbuf(req, REQ_REC_OFF + 1, 
+                if (KEY_IS(KEY_GRANT_SHRINK)) {
+                        body = lustre_swab_reqbuf(req, REQ_REC_OFF + 1,
                                                   sizeof(*body),
                                                   lustre_swab_ost_body);
                         if (!body)
                                 RETURN(-EFAULT);
 
-                        repbody = lustre_msg_buf(req->rq_repmsg, 
+                        repbody = lustre_msg_buf(req->rq_repmsg,
                                                  REPLY_REC_OFF,
                                                  sizeof(*repbody));
                         memcpy(repbody, body, sizeof(*body));
                         val = (char*)repbody;
-                } else 
+                } else
                         val = lustre_msg_buf(req->rq_reqmsg, REQ_REC_OFF + 1,0);
         }
 
@@ -1514,7 +1518,7 @@ static int ost_punch_prolong_locks(struct ptlrpc_request *req, struct obdo *oa)
         opd.opd_timeout = AT_OFF ? obd_timeout / 2 :
                           max(at_est2timeout(at_get(&req->rq_rqbd->
                               rqbd_service->srv_at_estimate)), ldlm_timeout);
-        
+
         CDEBUG(D_DLMTRACE,"refresh locks: "LPU64"/"LPU64" ("LPU64"->"LPU64")\n",
                res_id.name[0], res_id.name[1], opd.opd_policy.l_extent.start,
                opd.opd_policy.l_extent.end);