]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/ReplicatedPG: for copy_get get omap, firstly check ob whether has omap.
authorJianpeng Ma <jianpeng.ma@intel.com>
Wed, 23 Sep 2015 08:44:13 +0000 (16:44 +0800)
committerDavid Zafman <dzafman@redhat.com>
Mon, 4 Jan 2016 19:16:48 +0000 (11:16 -0800)
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
src/osd/ReplicatedPG.cc

index 61c0849529d8c2c579a59ea99f4a03d61f46a012..c72ef991fd235fa984f7e9f56136248dba242d00 100644 (file)
@@ -6844,7 +6844,7 @@ int ReplicatedPG::fill_in_copy_get(
 
   // omap
   uint32_t omap_keys = 0;
-  if (!pool.info.supports_omap()) {
+  if (!pool.info.supports_omap() || !oi.is_omap()) {
     cursor.omap_complete = true;
   } else {
     if (left > 0 && !cursor.omap_complete) {