From 08c39b84308f17afef776e08c09be3faa2b9eab4 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 22 May 2013 14:37:42 -0700 Subject: ReplicatedPG::submit_push_complete don't remove the head object 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 --- src/osd/ReplicatedPG.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 8f463098790..ab4da3ec314 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -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 >::const_iterator p = recovery_info.clone_subset.begin(); -- cgit v1.2.1