From: Samuel Just Date: Mon, 22 Dec 2014 18:16:58 +0000 (-0800) Subject: Merge pull request #3183 from ceph/wip-10262 X-Git-Tag: v0.92~102 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bc4e269b6130cd776c1bb78330fe56e4c548acb7;p=ceph.git Merge pull request #3183 from ceph/wip-10262 osd: fix handling of create+delete transaction Reviewed-by: Samuel Just --- bc4e269b6130cd776c1bb78330fe56e4c548acb7 diff --cc src/osd/ReplicatedPG.cc index caeaaec1d251,841b488dac24..8e9db7e3f9ab --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@@ -5621,9 -5539,10 +5621,10 @@@ void ReplicatedPG::finish_ctx(OpContex } } } else if (ctx->new_snapset.clones.size() && - !ctx->cache_evict) { + !ctx->cache_evict && + (!ctx->snapset_obc || !ctx->snapset_obc->obs.exists)) { // save snapset on _snap - hobject_t snapoid(soid.oid, soid.get_key(), CEPH_SNAPDIR, soid.hash, + hobject_t snapoid(soid.oid, soid.get_key(), CEPH_SNAPDIR, soid.get_hash(), info.pgid.pool(), soid.get_namespace()); dout(10) << " final snapset " << ctx->new_snapset << " in " << snapoid << dendl;