From: Cheng Cheng <ccheng.leo@gmail.com>
Date: Fri, 23 Jan 2015 19:20:39 +0000 (-0500)
Subject: librbd: clean up log message for copy-on-read
X-Git-Tag: v0.93~197^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3040%2Fhead;p=ceph.git

librbd: clean up log message for copy-on-read

Signed-off-by: Cheng Cheng <ccheng.leo@gmail.com>
---

diff --git a/src/librbd/AioRequest.cc b/src/librbd/AioRequest.cc
index 54039630276b..9c733b162c40 100644
--- a/src/librbd/AioRequest.cc
+++ b/src/librbd/AioRequest.cc
@@ -290,7 +290,7 @@ namespace librbd {
 	  m_state = LIBRBD_AIO_WRITE_COPYUP;
 
           if (is_copy_on_read(m_ictx, m_snap_id)) {
-	    m_ictx->copyup_list_lock.Lock();
+            m_ictx->copyup_list_lock.Lock();
             it = m_ictx->copyup_list.find(m_object_no);
             if (it == m_ictx->copyup_list.end()) {
               // If it is not in the list, create a CopyupRequest and wait for it.
@@ -302,16 +302,12 @@ namespace librbd {
               m_ictx->copyup_list[m_object_no] = new_req;
 
               m_entire_object = &(new_req->get_copyup_data());
-              ldout(m_ictx->cct, 20) << __func__ << " creating new Copyup for AioWrite, obj-"
-                                     << m_object_no << dendl;
-	      m_ictx->copyup_list_lock.Unlock();
+              m_ictx->copyup_list_lock.Unlock();
               new_req->read_from_parent();
-              ldout(m_ictx->cct, 20) << __func__ << " issuing read_from_parent" << dendl;
             } else {
-              ldout(m_ictx->cct, 20) << __func__ << " someone is reading back from parent" << dendl;
               it->second->append_request(this);
               m_entire_object = &it->second->get_copyup_data();
-	      m_ictx->copyup_list_lock.Unlock();
+              m_ictx->copyup_list_lock.Unlock();
             }
           } else {
             read_from_parent(m_object_image_extents);
@@ -342,8 +338,6 @@ namespace librbd {
       // CopyupRequest, m_read_data should be empty.
       if (m_entire_object != NULL) {
 	assert(m_ictx->copyup_list_lock.is_locked());
-	ldout(m_ictx->cct, 20) << __func__ << " releasing self pending, obj-"
-			       << m_object_no << dendl;
 	assert(m_ictx->copyup_list.find(m_object_no) !=
 	       m_ictx->copyup_list.end());
 	assert(m_read_data.length() == 0);
diff --git a/src/librbd/CopyupRequest.cc b/src/librbd/CopyupRequest.cc
index ab83b3ae836d..c22835f86814 100644
--- a/src/librbd/CopyupRequest.cc
+++ b/src/librbd/CopyupRequest.cc
@@ -29,7 +29,6 @@ namespace librbd {
     assert(m_ictx->copyup_list_lock.is_locked());
     assert(m_pending_requests.empty());
 
-    ldout(m_ictx->cct, 20) << __func__ << " removing the slot " << dendl;
     map<uint64_t, CopyupRequest*>::iterator it =
       m_ictx->copyup_list.find(m_object_no);
     assert(it != m_ictx->copyup_list.end());
@@ -38,10 +37,6 @@ namespace librbd {
     if (m_ictx->copyup_list.empty()) {
       m_ictx->copyup_list_cond.Signal();
     }
-
-    ldout(m_ictx->cct, 20) <<  __func__ << " remove the slot " << m_object_no
-                           << " in copyup_list, size = " << m_ictx->copyup_list.size()
-                           << dendl;
   }
 
   ceph::bufferlist& CopyupRequest::get_copyup_data() {