Revert "test_filestore_idempotent: use obj name from source coll add"

This reverts commit 0bc731ea93ae198afcdcba285751a6201c3de8de.

diff --git a/src/test/filestore/DeterministicOpSequence.cc b/src/test/filestore/DeterministicOpSequence.cc
index 9e13cfac86c32f3d22a4257595e1c48e7a94b4b1..c347df3b2a367f073dbfd8453b85544594e42a6c 100644 (file)
--- a/src/test/filestore/DeterministicOpSequence.cc
+++ b/src/test/filestore/DeterministicOpSequence.cc
@@ -435,10 +435,9 @@ void DeterministicOpSequence::do_coll_add(rngen_t& gen)
   }
   dout(0) << "do_coll_add " << orig_coll->m_coll.to_str() << "/" << obj->oid.name
         << " => " << new_coll->m_coll.to_str() << "/" << obj->oid.name << dendl;
-  hobject_t *old = new_coll->add_obj(obj_key, obj);
+  new_coll->touch_obj(obj_key);
 
-  _do_coll_add(orig_coll->m_coll, new_coll->m_coll, old, *obj);
-  delete old;
+  _do_coll_add(orig_coll->m_coll, new_coll->m_coll, *obj);
 }
 
 void DeterministicOpSequence::_do_touch(coll_t coll, hobject_t& obj)
@@ -520,15 +519,12 @@ void DeterministicOpSequence::_do_coll_move(coll_t new_coll,
   m_store->apply_transaction(t);
 }
 
-void DeterministicOpSequence::_do_coll_add(
-  coll_t orig_coll, coll_t new_coll,
-  hobject_t *old,
-  hobject_t &obj)
+void DeterministicOpSequence::_do_coll_add(coll_t orig_coll, coll_t new_coll,
+                                          hobject_t& obj)
 {
   ObjectStore::Transaction t;
   note_txn(&t);
-  if (old)
-    t.remove(new_coll, *old);
+  t.remove(new_coll, obj);
   t.collection_add(new_coll, orig_coll, obj);
   m_store->apply_transaction(t);
 }

diff --git a/src/test/filestore/DeterministicOpSequence.h b/src/test/filestore/DeterministicOpSequence.h
index d1ab1d454bff157631bd9ec89b06e2bb0bade8cb..44e632ab5c081fbda3f4aad09493a7181ce3465a 100644 (file)
--- a/src/test/filestore/DeterministicOpSequence.h
+++ b/src/test/filestore/DeterministicOpSequence.h
@@ -83,9 +83,7 @@ class DeterministicOpSequence : public TestFileStoreState {
       hobject_t& new_obj, uint64_t srcoff, uint64_t srclen,
       uint64_t dstoff, bufferlist& bl);
   virtual void _do_coll_move(coll_t new_coll, coll_t old_coll, hobject_t& obj);
-  virtual void _do_coll_add(
-    coll_t orig_coll, coll_t new_coll,
-    hobject_t *old, hobject_t& obj);
+  virtual void _do_coll_add(coll_t orig_coll, coll_t new_coll, hobject_t& obj);
   virtual void _do_coll_rename(coll_t orig_coll, coll_t new_coll);
 
   int _gen_coll_id(rngen_t& gen);

diff --git a/src/test/filestore/TestFileStoreState.cc b/src/test/filestore/TestFileStoreState.cc
index dd09756306e482e3fc84d254306e093989021be1..c786f87f268268c216e8b82cf8e13c5a51d8ac70 100644 (file)
--- a/src/test/filestore/TestFileStoreState.cc
+++ b/src/test/filestore/TestFileStoreState.cc
@@ -157,16 +157,6 @@ TestFileStoreState::coll_entry_t::~coll_entry_t()
   }
 }
 
-hobject_t *TestFileStoreState::coll_entry_t::add_obj(
-  int id, hobject_t *oid)
-{
-  hobject_t *ret = NULL;
-  if (m_objects.count(id))
-    ret = m_objects[id];
-  m_objects[id] = new hobject_t(*oid);
-  return ret;
-}
-
 hobject_t *TestFileStoreState::coll_entry_t::touch_obj(int id)
 {
   map<int, hobject_t*>::iterator it = m_objects.find(id);

diff --git a/src/test/filestore/TestFileStoreState.h b/src/test/filestore/TestFileStoreState.h
index 0810215c5b299e721ea14a33daa9e81bd313580b..d3bba692437100cc7c36a459eb6e139ce76d028f 100644 (file)
--- a/src/test/filestore/TestFileStoreState.h
+++ b/src/test/filestore/TestFileStoreState.h
@@ -38,7 +38,6 @@ public:
     ~coll_entry_t();
 
     hobject_t *touch_obj(int id);
-    hobject_t *add_obj(int id, hobject_t *oid);
     hobject_t *get_obj(int id);
     hobject_t *remove_obj(int id);
     hobject_t *get_obj_at(int pos, int *key = NULL);