]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG::submit_push_complete don't remove the head object
authorSamuel Just <sam.just@inktank.com>
Wed, 22 May 2013 21:37:42 +0000 (14:37 -0700)
committerSamuel Just <sam.just@inktank.com>
Wed, 22 May 2013 21:37:43 +0000 (14:37 -0700)
The object would have had to have been removed already.  With
fd caching, this extra remove might check the wrong replay_guard
since the fd caching mechanism assumes that between any operation
on an hobject_t oid and a remove operation, all operations on that
hobject_t must refer to the same inode.

Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/ReplicatedPG.cc

index 8f463098790f1afe48315f3157ee60b30c7ebe42..ab4da3ec31477aff72ac739fee2f34495f01fbbc 100644 (file)
@@ -5283,7 +5283,6 @@ void ReplicatedPG::submit_push_data(
 void ReplicatedPG::submit_push_complete(ObjectRecoveryInfo &recovery_info,
                                        ObjectStore::Transaction *t)
 {
-  remove_snap_mapped_object(*t, recovery_info.soid);
   t->collection_move(coll, get_temp_coll(t), recovery_info.soid);
   for (map<hobject_t, interval_set<uint64_t> >::const_iterator p =
         recovery_info.clone_subset.begin();