]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "ReplicatedPG::get_snapset_context: assert snap obj is not missing" 1695/head
authorSamuel Just <sam.just@inktank.com>
Fri, 18 Apr 2014 20:59:22 +0000 (13:59 -0700)
committerSamuel Just <sam.just@inktank.com>
Fri, 18 Apr 2014 20:59:22 +0000 (13:59 -0700)
This breaks mark_lost_unfound_revert.

This reverts commit 0d2177a18071ad9c9581826a43751c36bab5b2db.

src/osd/ReplicatedPG.cc

index b64ed390ab91b0c5691c130184941b80c2e550cb..64e2f3d04733ebb78ffc3014fe1b20189c69fee1 100644 (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(