From: Sage Weil <sage.weil@dreamhost.com>
Date: Thu, 12 Apr 2012 21:21:35 +0000 (-0700)
Subject: test_idempotent_sequence: remove existing target for collection_add
X-Git-Tag: v0.46~84^2~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bec1e50e75a2142ae293afd0e560744420f65e90;p=ceph.git

test_idempotent_sequence: remove existing target for collection_add

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---

diff --git a/src/test/filestore_test/DeterministicOpSequence.cc b/src/test/filestore_test/DeterministicOpSequence.cc
index 107a86e61196..d3ff95fad772 100644
--- a/src/test/filestore_test/DeterministicOpSequence.cc
+++ b/src/test/filestore_test/DeterministicOpSequence.cc
@@ -432,6 +432,7 @@ void DeterministicOpSequence::_do_coll_add(coll_t orig_coll, coll_t new_coll,
 {
   ObjectStore::Transaction t;
   note_txn(&t);
+  t.remove(new_coll, obj);
   t.collection_add(orig_coll, new_coll, obj);
   m_store->apply_transaction(t);
 }