From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Wed, 23 Sep 2015 08:44:13 +0000 (+0800)
Subject: osd/ReplicatedPG: for copy_get get omap, firstly check ob whether has omap.
X-Git-Tag: v10.0.3~139^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=771c869651132013054599f3decfc1017092a25f;p=ceph.git

osd/ReplicatedPG: for copy_get get omap, firstly check ob whether has omap.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 61c0849529d8..c72ef991fd23 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -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) {