From: Sage Weil <sage@inktank.com>
Date: Thu, 12 Dec 2013 23:41:04 +0000 (-0800)
Subject: osd/ReplicatedPG: debug: add an assert for copy-get
X-Git-Tag: v0.75~45^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d2d6a5faaf9b8b94d869ac179cf779ea4a21ae1;p=ceph.git

osd/ReplicatedPG: debug: add an assert for copy-get

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 4f04f64912ad..6d3c4f9fe755 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -4614,12 +4614,15 @@ int ReplicatedPG::fill_in_copy_get(bufferlist::iterator& bp, OSDOp& osd_op,
       cursor.data_complete = true;
       dout(20) << " got data" << dendl;
     }
+    assert(cursor.data_offset <= oi.size);
   }
 
   // omap
   std::map<std::string,bufferlist>& out_omap = reply_obj.omap;
   if (left > 0 && !cursor.omap_complete) {
-    ObjectMap::ObjectMapIterator iter = osd->store->get_omap_iterator(coll, oi.soid);
+    assert(cursor.data_complete);
+    ObjectMap::ObjectMapIterator iter =
+      osd->store->get_omap_iterator(coll, oi.soid);
     assert(iter);
     if (iter->valid()) {
       iter->upper_bound(cursor.omap_offset);