From: Neha Ojha <nojha@redhat.com>
Date: Wed, 26 Sep 2018 23:31:44 +0000 (-0700)
Subject: osd: print offset and length to track trimtrunc
X-Git-Tag: v12.2.10~38^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=595016cd52826ce65c2fae9ee8b413d6c798ec86;p=ceph.git

osd: print offset and length to track trimtrunc

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 07f7bd69425ed2c6b2a97bbf0034232a56fed046)

Conflicts:
	src/osd/ECBackend.cc
- trivial: luminous uses assert() instead of ceph_assert()
---

diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
index 1b9cfc1ff4d5..c2be4a0522e4 100644
--- a/src/osd/ECBackend.cc
+++ b/src/osd/ECBackend.cc
@@ -2203,6 +2203,10 @@ void ECBackend::objects_read_async(
 	  auto range = got.second.get_containing_range(offset, length);
 	  assert(range.first != range.second);
 	  assert(range.first.get_off() <= offset);
+          ldpp_dout(dpp, 30) << "offset: " << offset << dendl;
+          ldpp_dout(dpp, 30) << "range offset: " << range.first.get_off() << dendl;
+          ldpp_dout(dpp, 30) << "length: " << length << dendl;
+          ldpp_dout(dpp, 30) << "range length: " << range.first.get_len()  << dendl;
 	  assert(
 	    (offset + length) <=
 	    (range.first.get_off() + range.first.get_len()));
diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 34afcbbcc312..743d27bc2198 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -4851,6 +4851,11 @@ int PrimaryLogPG::do_read(OpContext *ctx, OSDOp& osd_op) {
     (osd->store->has_builtin_csum() && g_conf->osd_skip_data_digest) ||
     g_conf->osd_distrust_data_digest;
 
+  dout(30) << __func__ << " oi.size: " << oi.size << dendl;
+  dout(30) << __func__ << " oi.truncate_seq: " << oi.truncate_seq << dendl;
+  dout(30) << __func__ << " op.extent.truncate_seq: " << op.extent.truncate_seq << dendl;
+  dout(30) << __func__ << " op.extent.truncate_size: " << op.extent.truncate_size << dendl;
+
   // are we beyond truncate_size?
   if ( (seq < op.extent.truncate_seq) &&
        (op.extent.offset + op.extent.length > op.extent.truncate_size) )
@@ -4867,6 +4872,8 @@ int PrimaryLogPG::do_read(OpContext *ctx, OSDOp& osd_op) {
     trimmed_read = true;
   }
 
+  dout(30) << __func__ << "op.extent.length is now " << op.extent.length << dendl;
+
   // read into a buffer
   int result = 0;
   if (trimmed_read && op.extent.length == 0) {