Skip to content

Commit

Permalink
osd/ReplicatedPG: For obj has omap, it mean have omap data or omap he…
Browse files Browse the repository at this point in the history
…ader or have both.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit fc51ce2)
  • Loading branch information
majianpeng authored and smithfarm committed Apr 30, 2016
1 parent e219e85 commit f024259
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/osd/ReplicatedPG.cc
Expand Up @@ -6284,10 +6284,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;
Expand Down

0 comments on commit f024259

Please sign in to comment.