Merge pull request #8495 from athanatos/wip-14777

osd/ReplicatedPG::_rollback_to: update the OMAP flag

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-04-07 19:40:56 -04:00
commit 9821b29b75

View File

@ -6199,6 +6199,15 @@ int ReplicatedPG::_rollback_to(OpContext *ctx, ceph_osd_op& op)
obs.oi.set_omap_digest(rollback_to->obs.oi.omap_digest);
else
obs.oi.clear_omap_digest();
if (rollback_to->obs.oi.is_omap()) {
dout(10) << __func__ << " setting omap flag on " << obs.oi.soid << dendl;
obs.oi.set_flag(object_info_t::FLAG_OMAP);
} else {
dout(10) << __func__ << " clearing omap flag on " << obs.oi.soid << dendl;
obs.oi.clear_flag(object_info_t::FLAG_OMAP);
}
snapset.head_exists = true;
}
}