osd/ReplicatedPG: For obj has omap, it mean have omap data or omap he…

…ader or have both. Signed-off-by: Jianpeng Ma <[email protected]>
osynge · May 4, 2015 · fc51ce2 · fc51ce2
1 parent c7702bf
commit fc51ce2
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
@@ -6424,10 +6424,11 @@ void ReplicatedPG::process_copy_chunk(hobject_t oid, ceph_tid_t tid, int r)
     return;
   }
 
-  if (cop->omap_data.length())
+  if (cop->omap_data.length() || cop->omap_header.length())
     cop->results.has_omap = true;
 
-  if (r >= 0 && pool.info.require_rollback() && cop->omap_data.length()) {
+  if (r >= 0 && pool.info.require_rollback() &&
+      (cop->omap_data.length() || cop->omap_header.length())) {
     r = -EOPNOTSUPP;
   }
   cop->objecter_tid = 0;