From 1a588f18ba0e57df64f8a48c1393a4bc65019571 Mon Sep 17 00:00:00 2001 From: Haomai Wang Date: Sat, 8 Feb 2014 15:41:52 +0800 Subject: [PATCH] Rename test/filestore to test/objectstore Now ObjectStore support three backend types, so we need to make each backend share unit test to avoid duplicate codes. This patch mainly make workload_generator workable for objectstore. Signed-off-by: Haomai Wang --- qa/workunits/filestore/filestore.sh | 4 +- src/test/Makefile.am | 42 +++++++++---------- .../DeterministicOpSequence.cc | 6 +-- .../DeterministicOpSequence.h | 8 ++-- .../FileStoreDiff.cc | 0 .../FileStoreDiff.h | 0 .../FileStoreTracker.cc | 0 .../FileStoreTracker.h | 0 .../TestFileStoreState.cc | 42 +++++++++---------- .../TestFileStoreState.h | 18 ++++---- .../{filestore => objectstore}/chain_xattr.cc | 0 .../{filestore => objectstore}/run_seed_to.sh | 0 .../run_seed_to_range.sh | 0 .../{filestore => objectstore}/store_test.cc | 2 +- .../test_idempotent.cc | 0 .../test_idempotent_sequence.cc | 0 .../workload_generator.cc | 18 ++++---- .../workload_generator.h | 12 +++--- 18 files changed, 78 insertions(+), 74 deletions(-) rename src/test/{filestore => objectstore}/DeterministicOpSequence.cc (99%) rename src/test/{filestore => objectstore}/DeterministicOpSequence.h (93%) rename src/test/{filestore => objectstore}/FileStoreDiff.cc (100%) rename src/test/{filestore => objectstore}/FileStoreDiff.h (100%) rename src/test/{filestore => objectstore}/FileStoreTracker.cc (100%) rename src/test/{filestore => objectstore}/FileStoreTracker.h (100%) rename src/test/{filestore => objectstore}/TestFileStoreState.cc (84%) rename src/test/{filestore => objectstore}/TestFileStoreState.h (91%) rename src/test/{filestore => objectstore}/chain_xattr.cc (100%) rename src/test/{filestore => objectstore}/run_seed_to.sh (100%) rename src/test/{filestore => objectstore}/run_seed_to_range.sh (100%) rename src/test/{filestore => objectstore}/store_test.cc (99%) rename src/test/{filestore => objectstore}/test_idempotent.cc (100%) rename src/test/{filestore => objectstore}/test_idempotent_sequence.cc (100%) rename src/test/{filestore => objectstore}/workload_generator.cc (96%) rename src/test/{filestore => objectstore}/workload_generator.h (93%) diff --git a/qa/workunits/filestore/filestore.sh b/qa/workunits/filestore/filestore.sh index f951a37ec958e..391d1dc1a9b80 100755 --- a/qa/workunits/filestore/filestore.sh +++ b/qa/workunits/filestore/filestore.sh @@ -23,7 +23,7 @@ export PATH=/sbin:$PATH : ${EXT3:=$(which mkfs.ext3)} : ${XFS:=$(which mkfs.xfs)} : ${BTRFS:=$(which mkfs.btrfs)} -: ${CEPH_TEST_FILESTORE:=ceph_test_filestore} +: ${CEPH_TEST_FILESTORE:=ceph_test_objectstore} : ${FILE_SYSTEMS:=EXT4} # EXT3 XFS BTRFS : ${DEBUG:=} @@ -76,5 +76,5 @@ else main fi # Local Variables: -# compile-command: "CEPH_TEST_FILESTORE=../../../src/ceph_test_filestore filestore.sh TEST" +# compile-command: "CEPH_TEST_FILESTORE=../../../src/ceph_test_objectstore filestore.sh TEST" # End: diff --git a/src/test/Makefile.am b/src/test/Makefile.am index 83b83f4676ef1..177a7a74f9dde 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -523,7 +523,7 @@ unittest_escape_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) unittest_escape_CXXFLAGS = $(UNITTEST_CXXFLAGS) check_PROGRAMS += unittest_escape -unittest_chain_xattr_SOURCES = test/filestore/chain_xattr.cc +unittest_chain_xattr_SOURCES = test/objectstore/chain_xattr.cc unittest_chain_xattr_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) unittest_chain_xattr_CXXFLAGS = $(UNITTEST_CXXFLAGS) check_PROGRAMS += unittest_chain_xattr @@ -853,30 +853,30 @@ ceph_test_libcephfs_CXXFLAGS = $(UNITTEST_CXXFLAGS) bin_DEBUGPROGRAMS += ceph_test_libcephfs if LINUX -ceph_test_filestore_SOURCES = test/filestore/store_test.cc -ceph_test_filestore_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) -ceph_test_filestore_CXXFLAGS = $(UNITTEST_CXXFLAGS) -bin_DEBUGPROGRAMS += ceph_test_filestore +ceph_test_objectstore_SOURCES = test/objectstore/store_test.cc +ceph_test_objectstore_LDADD = $(LIBOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) +ceph_test_objectstore_CXXFLAGS = $(UNITTEST_CXXFLAGS) +bin_DEBUGPROGRAMS += ceph_test_objectstore endif -ceph_test_filestore_workloadgen_SOURCES = \ - test/filestore/workload_generator.cc \ - test/filestore/TestFileStoreState.cc -ceph_test_filestore_workloadgen_LDADD = $(LIBOS) $(CEPH_GLOBAL) -bin_DEBUGPROGRAMS += ceph_test_filestore_workloadgen +ceph_test_objectstore_workloadgen_SOURCES = \ + test/objectstore/workload_generator.cc \ + test/objectstore/TestObjectStoreState.cc +ceph_test_objectstore_workloadgen_LDADD = $(LIBOS) $(CEPH_GLOBAL) +bin_DEBUGPROGRAMS += ceph_test_objectstore_workloadgen ceph_test_filestore_idempotent_SOURCES = \ - test/filestore/test_idempotent.cc \ - test/filestore/FileStoreTracker.cc \ + test/objectstore/test_idempotent.cc \ + test/objectstore/FileStoreTracker.cc \ test/common/ObjectContents.cc ceph_test_filestore_idempotent_LDADD = $(LIBOS) $(CEPH_GLOBAL) bin_DEBUGPROGRAMS += ceph_test_filestore_idempotent ceph_test_filestore_idempotent_sequence_SOURCES = \ - test/filestore/test_idempotent_sequence.cc \ - test/filestore/DeterministicOpSequence.cc \ - test/filestore/TestFileStoreState.cc \ - test/filestore/FileStoreDiff.cc + test/objectstore/test_idempotent_sequence.cc \ + test/objectstore/DeterministicOpSequence.cc \ + test/objectstore/TestObjectStoreState.cc \ + test/objectstore/FileStoreDiff.cc ceph_test_filestore_idempotent_sequence_LDADD = $(LIBOS) $(CEPH_GLOBAL) bin_DEBUGPROGRAMS += ceph_test_filestore_idempotent_sequence @@ -950,11 +950,11 @@ noinst_HEADERS += \ test/bench/testfilestore_backend.h \ test/common/ObjectContents.h \ test/encoding/types.h \ - test/filestore/DeterministicOpSequence.h \ - test/filestore/FileStoreDiff.h \ - test/filestore/FileStoreTracker.h \ - test/filestore/TestFileStoreState.h \ - test/filestore/workload_generator.h \ + test/objectstore/DeterministicOpSequence.h \ + test/objectstore/FileStoreDiff.h \ + test/objectstore/FileStoreTracker.h \ + test/objectstore/TestObjectStoreState.h \ + test/objectstore/workload_generator.h \ test/kv_store_bench.h \ test/librados/test.h \ test/ObjectMap/KeyValueDBMemory.h \ diff --git a/src/test/filestore/DeterministicOpSequence.cc b/src/test/objectstore/DeterministicOpSequence.cc similarity index 99% rename from src/test/filestore/DeterministicOpSequence.cc rename to src/test/objectstore/DeterministicOpSequence.cc index d9a0be43fc904..09c9f5e7ff112 100644 --- a/src/test/filestore/DeterministicOpSequence.cc +++ b/src/test/objectstore/DeterministicOpSequence.cc @@ -18,7 +18,7 @@ #include #include #include -#include "os/FileStore.h" +#include "os/ObjectStore.h" #include "common/ceph_argparse.h" #include "global/global_init.h" #include "common/debug.h" @@ -34,9 +34,9 @@ #undef dout_prefix #define dout_prefix *_dout << "deterministic_seq " -DeterministicOpSequence::DeterministicOpSequence(FileStore *store, +DeterministicOpSequence::DeterministicOpSequence(ObjectStore *store, std::string status) - : TestFileStoreState(store), + : TestObjectStoreState(store), txn(0), m_osr("OSR") { diff --git a/src/test/filestore/DeterministicOpSequence.h b/src/test/objectstore/DeterministicOpSequence.h similarity index 93% rename from src/test/filestore/DeterministicOpSequence.h rename to src/test/objectstore/DeterministicOpSequence.h index 818d0ed644895..1980c98c3c59a 100644 --- a/src/test/filestore/DeterministicOpSequence.h +++ b/src/test/objectstore/DeterministicOpSequence.h @@ -16,18 +16,18 @@ #include #include #include -#include "os/FileStore.h" +#include "os/ObjectStore.h" #include #include #include -#include "TestFileStoreState.h" +#include "TestObjectStoreState.h" typedef boost::mt11213b rngen_t; -class DeterministicOpSequence : public TestFileStoreState { +class DeterministicOpSequence : public TestObjectStoreState { public: - DeterministicOpSequence(FileStore *store, std::string status = std::string()); + DeterministicOpSequence(ObjectStore *store, std::string status = std::string()); virtual ~DeterministicOpSequence(); virtual void generate(int seed, int num_txs); diff --git a/src/test/filestore/FileStoreDiff.cc b/src/test/objectstore/FileStoreDiff.cc similarity index 100% rename from src/test/filestore/FileStoreDiff.cc rename to src/test/objectstore/FileStoreDiff.cc diff --git a/src/test/filestore/FileStoreDiff.h b/src/test/objectstore/FileStoreDiff.h similarity index 100% rename from src/test/filestore/FileStoreDiff.h rename to src/test/objectstore/FileStoreDiff.h diff --git a/src/test/filestore/FileStoreTracker.cc b/src/test/objectstore/FileStoreTracker.cc similarity index 100% rename from src/test/filestore/FileStoreTracker.cc rename to src/test/objectstore/FileStoreTracker.cc diff --git a/src/test/filestore/FileStoreTracker.h b/src/test/objectstore/FileStoreTracker.h similarity index 100% rename from src/test/filestore/FileStoreTracker.h rename to src/test/objectstore/FileStoreTracker.h diff --git a/src/test/filestore/TestFileStoreState.cc b/src/test/objectstore/TestFileStoreState.cc similarity index 84% rename from src/test/filestore/TestFileStoreState.cc rename to src/test/objectstore/TestFileStoreState.cc index a34e52636cebb..34e25fb2e2c52 100644 --- a/src/test/filestore/TestFileStoreState.cc +++ b/src/test/objectstore/TestFileStoreState.cc @@ -16,23 +16,23 @@ #include #include #include -#include "os/FileStore.h" +#include "os/ObjectStore.h" #include "common/ceph_argparse.h" #include "global/global_init.h" #include "common/debug.h" #include #include -#include "TestFileStoreState.h" +#include "TestObjectStoreState.h" #include "include/assert.h" #define dout_subsys ceph_subsys_filestore #undef dout_prefix #define dout_prefix *_dout << "ceph_test_filestore_state " -const coll_t TestFileStoreState::META_COLL("meta"); -const coll_t TestFileStoreState::TEMP_COLL("temp"); +const coll_t TestObjectStoreState::META_COLL("meta"); +const coll_t TestObjectStoreState::TEMP_COLL("temp"); -void TestFileStoreState::init(int colls, int objs) +void TestObjectStoreState::init(int colls, int objs) { dout(5) << "init " << colls << " colls " << objs << " objs" << dendl; @@ -77,7 +77,7 @@ void TestFileStoreState::init(int colls, int objs) dout(5) << "init finished" << dendl; } -TestFileStoreState::coll_entry_t *TestFileStoreState::coll_create(int id) +TestObjectStoreState::coll_entry_t *TestObjectStoreState::coll_create(int id) { char buf[100]; char meta_buf[100]; @@ -88,8 +88,8 @@ TestFileStoreState::coll_entry_t *TestFileStoreState::coll_create(int id) return (new coll_entry_t(id, buf, meta_buf)); } -TestFileStoreState::coll_entry_t* -TestFileStoreState::get_coll(int key, bool erase) +TestObjectStoreState::coll_entry_t* +TestObjectStoreState::get_coll(int key, bool erase) { dout(5) << "get_coll id " << key << dendl; @@ -115,8 +115,8 @@ TestFileStoreState::get_coll(int key, bool erase) return entry; } -TestFileStoreState::coll_entry_t* -TestFileStoreState::get_coll_at(int pos, bool erase) +TestObjectStoreState::coll_entry_t* +TestObjectStoreState::get_coll_at(int pos, bool erase) { dout(5) << "get_coll_at pos " << pos << dendl; @@ -147,7 +147,7 @@ TestFileStoreState::get_coll_at(int pos, bool erase) return entry; } -TestFileStoreState::coll_entry_t::~coll_entry_t() +TestObjectStoreState::coll_entry_t::~coll_entry_t() { if (m_objects.size() > 0) { map::iterator it = m_objects.begin(); @@ -161,14 +161,14 @@ TestFileStoreState::coll_entry_t::~coll_entry_t() } } -bool TestFileStoreState::coll_entry_t::check_for_obj(int id) +bool TestObjectStoreState::coll_entry_t::check_for_obj(int id) { if (m_objects.count(id)) return true; return false; } -hobject_t *TestFileStoreState::coll_entry_t::touch_obj(int id) +hobject_t *TestObjectStoreState::coll_entry_t::touch_obj(int id) { map::iterator it = m_objects.find(id); if (it != m_objects.end()) { @@ -188,7 +188,7 @@ hobject_t *TestFileStoreState::coll_entry_t::touch_obj(int id) return obj; } -hobject_t *TestFileStoreState::coll_entry_t::get_obj(int id) +hobject_t *TestObjectStoreState::coll_entry_t::get_obj(int id) { return get_obj(id, false); } @@ -198,12 +198,12 @@ hobject_t *TestFileStoreState::coll_entry_t::get_obj(int id) * @param id Object's id in the map. * @return The object or NULL in case of error. */ -hobject_t *TestFileStoreState::coll_entry_t::remove_obj(int id) +hobject_t *TestObjectStoreState::coll_entry_t::remove_obj(int id) { return get_obj(id, true); } -hobject_t *TestFileStoreState::coll_entry_t::get_obj(int id, bool remove) +hobject_t *TestObjectStoreState::coll_entry_t::get_obj(int id, bool remove) { map::iterator it = m_objects.find(id); if (it == m_objects.end()) { @@ -222,7 +222,7 @@ hobject_t *TestFileStoreState::coll_entry_t::get_obj(int id, bool remove) return obj; } -hobject_t *TestFileStoreState::coll_entry_t::get_obj_at(int pos, int *key) +hobject_t *TestObjectStoreState::coll_entry_t::get_obj_at(int pos, int *key) { return get_obj_at(pos, false, key); } @@ -232,12 +232,12 @@ hobject_t *TestFileStoreState::coll_entry_t::get_obj_at(int pos, int *key) * @param pos The map's position in which the object lies. * @return The object or NULL in case of error. */ -hobject_t *TestFileStoreState::coll_entry_t::remove_obj_at(int pos, int *key) +hobject_t *TestObjectStoreState::coll_entry_t::remove_obj_at(int pos, int *key) { return get_obj_at(pos, true, key); } -hobject_t *TestFileStoreState::coll_entry_t::get_obj_at(int pos, +hobject_t *TestObjectStoreState::coll_entry_t::get_obj_at(int pos, bool remove, int *key) { if (m_objects.empty()) { @@ -274,13 +274,13 @@ hobject_t *TestFileStoreState::coll_entry_t::get_obj_at(int pos, } hobject_t* -TestFileStoreState::coll_entry_t::replace_obj(int id, hobject_t *obj) { +TestObjectStoreState::coll_entry_t::replace_obj(int id, hobject_t *obj) { hobject_t *old_obj = remove_obj(id); m_objects.insert(make_pair(id, obj)); return old_obj; } -int TestFileStoreState::coll_entry_t::get_random_obj_id(rngen_t& gen) +int TestObjectStoreState::coll_entry_t::get_random_obj_id(rngen_t& gen) { ceph_assert(!m_objects.empty()); diff --git a/src/test/filestore/TestFileStoreState.h b/src/test/objectstore/TestFileStoreState.h similarity index 91% rename from src/test/filestore/TestFileStoreState.h rename to src/test/objectstore/TestFileStoreState.h index 7cd4527bccc51..dad2aab73791c 100644 --- a/src/test/filestore/TestFileStoreState.h +++ b/src/test/objectstore/TestFileStoreState.h @@ -10,10 +10,10 @@ * License version 2.1, as published by the Free Software * Foundation. See file COPYING. */ -#ifndef TEST_FILESTORE_STATE_H_ -#define TEST_FILESTORE_STATE_H_ +#ifndef TEST_OBJECTSTORE_STATE_H_ +#define TEST_OBJECTSTORE_STATE_H_ -#include "os/FileStore.h" +#include "os/ObjectStore.h" #include #include #include @@ -22,7 +22,7 @@ typedef boost::mt11213b rngen_t; -class TestFileStoreState { +class TestObjectStoreState { public: struct coll_entry_t { int m_id; @@ -96,13 +96,13 @@ public: static const int m_default_num_colls = 30; public: - TestFileStoreState(FileStore *store) : + TestObjectStoreState(ObjectStore *store) : m_next_coll_nr(0), m_num_objs_per_coll(10), m_num_objects(0), m_max_in_flight(0), m_finished_lock("Finished Lock") { m_in_flight.set(0); m_store.reset(store); } - ~TestFileStoreState() { + ~TestObjectStoreState() { map::iterator it = m_collections.begin(); while (it != m_collections.end()) { if (it->second) @@ -128,11 +128,11 @@ public: class C_OnFinished: public Context { protected: - TestFileStoreState *m_state; + TestObjectStoreState *m_state; ObjectStore::Transaction *m_tx; public: - C_OnFinished(TestFileStoreState *state, + C_OnFinished(TestObjectStoreState *state, ObjectStore::Transaction *t) : m_state(state), m_tx(t) { } void finish(int r) { @@ -145,4 +145,4 @@ public: }; }; -#endif /* TEST_FILESTORE_STATE_H_ */ +#endif /* TEST_OBJECTSTORE_STATE_H_ */ diff --git a/src/test/filestore/chain_xattr.cc b/src/test/objectstore/chain_xattr.cc similarity index 100% rename from src/test/filestore/chain_xattr.cc rename to src/test/objectstore/chain_xattr.cc diff --git a/src/test/filestore/run_seed_to.sh b/src/test/objectstore/run_seed_to.sh similarity index 100% rename from src/test/filestore/run_seed_to.sh rename to src/test/objectstore/run_seed_to.sh diff --git a/src/test/filestore/run_seed_to_range.sh b/src/test/objectstore/run_seed_to_range.sh similarity index 100% rename from src/test/filestore/run_seed_to_range.sh rename to src/test/objectstore/run_seed_to_range.sh diff --git a/src/test/filestore/store_test.cc b/src/test/objectstore/store_test.cc similarity index 99% rename from src/test/filestore/store_test.cc rename to src/test/objectstore/store_test.cc index 8e88ab325e126..4f66bd6d8929e 100644 --- a/src/test/filestore/store_test.cc +++ b/src/test/objectstore/store_test.cc @@ -17,7 +17,7 @@ #include #include #include -#include "os/FileStore.h" +#include "os/ObjectStore.h" #include "os/KeyValueStore.h" #include "include/Context.h" #include "common/ceph_argparse.h" diff --git a/src/test/filestore/test_idempotent.cc b/src/test/objectstore/test_idempotent.cc similarity index 100% rename from src/test/filestore/test_idempotent.cc rename to src/test/objectstore/test_idempotent.cc diff --git a/src/test/filestore/test_idempotent_sequence.cc b/src/test/objectstore/test_idempotent_sequence.cc similarity index 100% rename from src/test/filestore/test_idempotent_sequence.cc rename to src/test/objectstore/test_idempotent_sequence.cc diff --git a/src/test/filestore/workload_generator.cc b/src/test/objectstore/workload_generator.cc similarity index 96% rename from src/test/filestore/workload_generator.cc rename to src/test/objectstore/workload_generator.cc index aadb4758d96d7..acf0fc147960f 100644 --- a/src/test/filestore/workload_generator.cc +++ b/src/test/objectstore/workload_generator.cc @@ -20,7 +20,7 @@ #include #include #include -#include "os/FileStore.h" +#include "os/ObjectStore.h" #include "common/ceph_argparse.h" #include "global/global_init.h" #include "common/debug.h" @@ -29,7 +29,7 @@ #include "workload_generator.h" #include "include/assert.h" -#include "TestFileStoreState.h" +#include "TestObjectStoreState.h" static const char *our_name = NULL; void usage(); @@ -40,7 +40,7 @@ boost::scoped_ptr wrkldgen; WorkloadGenerator::WorkloadGenerator(vector args) - : TestFileStoreState(NULL), + : TestObjectStoreState(NULL), m_max_in_flight(def_max_in_flight), m_num_ops(-1), m_destroy_coll_every_nr_runs(def_destroy_coll_every_nr_runs), @@ -67,7 +67,10 @@ WorkloadGenerator::WorkloadGenerator(vector args) err = ::mkdir(g_conf->osd_data.c_str(), 0755); ceph_assert(err == 0 || (err < 0 && errno == EEXIST)); - ObjectStore *store_ptr = new FileStore(g_conf->osd_data, g_conf->osd_journal); + ObjectStore *store_ptr = ObjectStore::create(g_ceph_context, + g_conf->osd_objectstore, + g_conf->osd_data, + g_conf->osd_journal); m_store.reset(store_ptr); err = m_store->mkfs(); ceph_assert(err == 0); @@ -193,7 +196,7 @@ int WorkloadGenerator::get_uniform_random_value(int min, int max) return value(m_rng); } -TestFileStoreState::coll_entry_t *WorkloadGenerator::get_rnd_coll_entry(bool erase = false) +TestObjectStoreState::coll_entry_t *WorkloadGenerator::get_rnd_coll_entry(bool erase = false) { int index = get_uniform_random_value(0, m_collections_ids.size()-1); coll_entry_t *entry = get_coll_at(index, erase); @@ -358,7 +361,7 @@ void WorkloadGenerator::do_destroy_collection(ObjectStore::Transaction *t, t->remove(META_COLL, entry->m_meta_obj); } -TestFileStoreState::coll_entry_t +TestObjectStoreState::coll_entry_t *WorkloadGenerator::do_create_collection(ObjectStore::Transaction *t, C_StatState *stat) { @@ -429,7 +432,7 @@ void WorkloadGenerator::run() ObjectStore::Transaction *t = new ObjectStore::Transaction; Context *c; bool destroy_collection = false; - TestFileStoreState::coll_entry_t *entry = NULL; + TestObjectStoreState::coll_entry_t *entry = NULL; if (m_do_stats) { @@ -508,6 +511,7 @@ void usage() \n\ Global Options:\n\ -c FILE Read configuration from FILE\n\ + --osd-objectstore TYPE Set OSD ObjectStore type\n\ --osd-data PATH Set OSD Data path\n\ --osd-journal PATH Set OSD Journal path\n\ --osd-journal-size VAL Set Journal size\n\ diff --git a/src/test/filestore/workload_generator.h b/src/test/objectstore/workload_generator.h similarity index 93% rename from src/test/filestore/workload_generator.h rename to src/test/objectstore/workload_generator.h index 80e95dae6ec80..3235fe86e996f 100644 --- a/src/test/filestore/workload_generator.h +++ b/src/test/objectstore/workload_generator.h @@ -13,18 +13,18 @@ #ifndef WORKLOAD_GENERATOR_H_ #define WORKLOAD_GENERATOR_H_ -#include "os/FileStore.h" +#include "os/ObjectStore.h" #include #include #include #include #include -#include "TestFileStoreState.h" +#include "TestObjectStoreState.h" typedef boost::mt11213b rngen_t; -class WorkloadGenerator : public TestFileStoreState { +class WorkloadGenerator : public TestObjectStoreState { public: static const int def_max_in_flight = 50; @@ -125,17 +125,17 @@ public: m_store->umount(); } - class C_OnReadable: public TestFileStoreState::C_OnFinished { + class C_OnReadable: public TestObjectStoreState::C_OnFinished { WorkloadGenerator *wrkldgen_state; public: C_OnReadable(WorkloadGenerator *state, ObjectStore::Transaction *t) - :TestFileStoreState::C_OnFinished(state, t), wrkldgen_state(state) { } + :TestObjectStoreState::C_OnFinished(state, t), wrkldgen_state(state) { } void finish(int r) { - TestFileStoreState::C_OnFinished::finish(r); + TestObjectStoreState::C_OnFinished::finish(r); wrkldgen_state->m_nr_runs.inc(); } }; -- 2.39.5