]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
filestore: guard collection_remove replay
authorSage Weil <sage.weil@dreamhost.com>
Thu, 8 Mar 2012 04:55:27 +0000 (20:55 -0800)
committerSage Weil <sage@newdream.net>
Sat, 10 Mar 2012 00:32:23 +0000 (16:32 -0800)
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
src/os/FileStore.cc

index 5089e70994f4d474750ea9cc4f7575beb8d3cc75..1cb30da9e2c93a3c862536bfd861ac7baf27280e 100644 (file)
@@ -2625,7 +2625,8 @@ unsigned FileStore::_do_transaction(Transaction& t, uint64_t op_seq, int trans_n
        {
        coll_t cid = i.get_cid();
        hobject_t oid = i.get_oid();
-       r = _collection_remove(cid, oid);
+       if (_check_replay_guard(cid, spos))
+         r = _collection_remove(cid, oid);
        }
       break;