]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/ReplicatedPG: debug: add an assert for copy-get
authorSage Weil <sage@inktank.com>
Thu, 12 Dec 2013 23:41:04 +0000 (15:41 -0800)
committerSage Weil <sage@inktank.com>
Fri, 20 Dec 2013 00:40:00 +0000 (16:40 -0800)
Signed-off-by: Sage Weil <sage@inktank.com>
src/osd/ReplicatedPG.cc

index 4f04f64912ad0655e9ed12941e3e764601aef086..6d3c4f9fe755d2e211ba3f36bac4b0a481303643 100644 (file)
@@ -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);