Merge pull request #1695 from ceph/wip-8153

Revert "ReplicatedPG::get_snapset_context: assert snap obj is not missin...

Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2014-04-18 14:09:37 -07:00
commit e087eae868

View File

@ -7215,10 +7215,6 @@ SnapSetContext *ReplicatedPG::get_snapset_context(
bool can_create,
map<string, bufferlist> *attrs)
{
// ensure that snap obj is not missing
assert(attrs ||
(!pg_log.get_missing().is_missing(oid.get_head()) &&
!pg_log.get_missing().is_missing(oid.get_snapdir())));
Mutex::Locker l(snapset_contexts_lock);
SnapSetContext *ssc;
map<hobject_t, SnapSetContext*>::iterator p = snapset_contexts.find(