Skip to content

Commit

Permalink
Consolidate fixture apps.
Browse files Browse the repository at this point in the history
  • Loading branch information
@szmyd
szmyd committed Oct 20, 2023
1 parent 76f0730 commit e1e728c
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 94 deletions.
5 changes: 3 additions & 2 deletions src/lib/homestore_backend/hs_blob_manager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,9 @@ BlobManager::AsyncResult< blob_id_t > HSHomeObject::_put_blob(ShardInfo const& s
}

// Compute the checksum of blob and metadata.
compute_blob_payload_hash(blob_header->hash_algorithm, blob.body.bytes, blob.body.size, (uint8_t*)blob.user_key.data(),
blob.user_key.size(), blob_header->hash, BlobHeader::blob_max_hash_len);
compute_blob_payload_hash(blob_header->hash_algorithm, blob.body.bytes, blob.body.size,
(uint8_t*)blob.user_key.data(), blob.user_key.size(), blob_header->hash,
BlobHeader::blob_max_hash_len);

repl_dev->async_alloc_write(req->hdr_buf_, sisl::blob{}, sgs, req);
return req->result().deferValue([this, header, blob_header, blob = std::move(blob), blob_bytes, blob_copied,
Expand Down
89 changes: 4 additions & 85 deletions src/lib/homestore_backend/tests/test_hs_homeobject.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
#include "lib/homestore_backend/hs_homeobject.hpp"
#include "bits_generator.hpp"

#include "lib/tests/fixture_app.hpp"

using namespace std::chrono_literals;

using homeobject::BlobError;
Expand All @@ -24,55 +26,6 @@ using namespace homeobject;

#define hex_bytes(buffer, len) fmt::format("{}", spdlog::to_hex((buffer), (buffer) + (len)))

SISL_LOGGING_INIT(logging, HOMEOBJECT_LOG_MODS)
SISL_OPTIONS_ENABLE(logging, test_home_object)

SISL_OPTION_GROUP(
test_home_object,
(num_pgs, "", "num_pgs", "number of pgs", ::cxxopts::value< uint64_t >()->default_value("10"), "number"),
(num_shards, "", "num_shards", "number of shards", ::cxxopts::value< uint64_t >()->default_value("20"), "number"),
(num_blobs, "", "num_blobs", "number of blobs", ::cxxopts::value< uint64_t >()->default_value("50"), "number"));

class FixtureApp : public homeobject::HomeObjectApplication {
private:
std::string fpath_{fmt::format("/tmp/test_home_object.data.{}", std::to_string(rand()))};

public:
bool spdk_mode() const override { return false; }
uint32_t threads() const override { return 2; }
void set_restart(bool r = true) { restart_ = r; }
std::list< std::filesystem::path > devices() const override {
if (!restart_) {
/* create files */
LOGINFO("creating {} device file with size={}", fpath_, homestore::in_bytes(2 * Gi));
if (std::filesystem::exists(fpath_)) { std::filesystem::remove(fpath_); }
std::ofstream ofs{fpath_, std::ios::binary | std::ios::out | std::ios::trunc};
std::filesystem::resize_file(fpath_, 2 * Gi);
} else {
LOGINFO("Skipping create device files");
}

auto device_info = std::list< std::filesystem::path >();
device_info.emplace_back(std::filesystem::canonical(fpath_));
return device_info;
}

~FixtureApp() {
if (!fpath_.empty()) { std::filesystem::remove(fpath_); }
}

homeobject::peer_id_t discover_svcid(std::optional< homeobject::peer_id_t > const&) const override {
return boost::uuids::random_generator()();
}

/// TODO
/// This will have to work if we test replication in the future
std::string lookup_peer(homeobject::peer_id_t const&) const override { return "test_fixture.com"; }

private:
bool restart_{false};
};

TEST(HomeObject, BasicEquivalence) {
auto app = std::make_shared< FixtureApp >();
auto obj_inst = homeobject::init_homeobject(std::weak_ptr< homeobject::HomeObjectApplication >(app));
Expand Down Expand Up @@ -126,46 +79,12 @@ class HomeObjectFixture : public ::testing::Test {
void restart() {
LOGINFO("Restarting homeobject.");
_obj_inst.reset();
app->set_restart();
_obj_inst = homeobject::init_homeobject(std::weak_ptr< homeobject::HomeObjectApplication >(app));
std::this_thread::sleep_for(std::chrono::seconds{1});
}
};

TEST_F(HomeObjectFixture, TestValidations) {
EXPECT_EQ(_obj_inst->pg_manager()->create_pg(PGInfo(0u)).get().error(), PGError::INVALID_ARG);
auto info = PGInfo(0u);
info.members.insert(PGMember{boost::uuids::random_generator()()});
EXPECT_EQ(_obj_inst->pg_manager()->create_pg(std::move(info)).get().error(), PGError::INVALID_ARG);
EXPECT_EQ(_obj_inst->pg_manager()
->replace_member(0, boost::uuids::random_generator()(),
homeobject::PGMember{boost::uuids::random_generator()(), "new_member", 1})
.get()
.error(),
PGError::UNSUPPORTED_OP);
EXPECT_EQ(ShardError::UNKNOWN_PG, _obj_inst->shard_manager()->create_shard(1, 1000).get().error());
EXPECT_EQ(ShardError::INVALID_ARG, _obj_inst->shard_manager()->create_shard(1, 0).get().error());
EXPECT_EQ(ShardError::INVALID_ARG, _obj_inst->shard_manager()->create_shard(1, 2 * Gi).get().error());
EXPECT_EQ(ShardError::UNKNOWN_PG, _obj_inst->shard_manager()->list_shards(1).get().error());
EXPECT_EQ(ShardError::UNKNOWN_SHARD, _obj_inst->shard_manager()->get_shard(1).get().error());
EXPECT_EQ(ShardError::UNKNOWN_SHARD, _obj_inst->shard_manager()->seal_shard(1).get().error());
}

TEST_F(HomeObjectFixture, PutBlobMissingShard) {
EXPECT_EQ(
BlobError::UNKNOWN_SHARD,
_obj_inst->blob_manager()->put(1, homeobject::Blob{sisl::io_blob_safe(4096), "user_key", 0ul}).get().error());
}

TEST_F(HomeObjectFixture, GetBlobMissingShard) {
EXPECT_EQ(BlobError::UNKNOWN_SHARD, _obj_inst->blob_manager()->get(1, 0u, 0ul, UINT64_MAX).get().error());
}

TEST_F(HomeObjectFixture, DeleteBlobMissingShard) {
EXPECT_EQ(BlobError::UNKNOWN_SHARD, _obj_inst->blob_manager()->del(1, 0u).get().error());
}

TEST_F(HomeObjectFixture, BasicPutGetBlob) {
TEST_F(HomeObjectFixture, BasicPutGetBlobWRestart) {
auto num_pgs = SISL_OPTIONS["num_pgs"].as< uint64_t >();
auto num_shards_per_pg = SISL_OPTIONS["num_shards"].as< uint64_t >() / num_pgs;
auto num_blobs_per_shard = SISL_OPTIONS["num_blobs"].as< uint64_t >() / num_shards_per_pg;
Expand Down Expand Up @@ -275,7 +194,7 @@ TEST_F(HomeObjectFixture, BasicPutGetBlob) {
}
}

TEST_F(HomeObjectFixture, SealShard) {
TEST_F(HomeObjectFixture, SealShardWithRestart) {
// Create a pg, shard, put blob should succeed, seal and put blob again should fail.
// Recover and put blob again should fail.
pg_id_t pg_id{1};
Expand Down
2 changes: 1 addition & 1 deletion src/lib/tests/BlobManagerTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ TEST_F(TestFixture, BasicTests) {
int main(int argc, char* argv[]) {
int parsed_argc = argc;
::testing::InitGoogleTest(&parsed_argc, argv);
SISL_OPTIONS_LOAD(parsed_argc, argv, logging, blob_manager_test);
SISL_OPTIONS_LOAD(parsed_argc, argv, logging, test_home_object);
sisl::logging::SetLogger(std::string(argv[0]));
spdlog::set_pattern("[%D %T.%e] [%n] [%^%l%$] [%t] %v");
parsed_argc = 1;
Expand Down
16 changes: 10 additions & 6 deletions src/lib/tests/fixture_app.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,23 @@

SISL_LOGGING_INIT(logging, HOMEOBJECT_LOG_MODS)

SISL_OPTION_GROUP(blob_manager_test,
(num_iters, "", "num_iters", "number of iterations per loop",
::cxxopts::value< uint64_t >()->default_value("100000"), "number"));
SISL_OPTION_GROUP(
test_home_object,
(num_iters, "", "num_iters", "number of iterations per loop",
::cxxopts::value< uint64_t >()->default_value("100000"), "number"),
(num_pgs, "", "num_pgs", "number of pgs", ::cxxopts::value< uint64_t >()->default_value("10"), "number"),
(num_shards, "", "num_shards", "number of shards", ::cxxopts::value< uint64_t >()->default_value("20"), "number"),
(num_blobs, "", "num_blobs", "number of blobs", ::cxxopts::value< uint64_t >()->default_value("50"), "number"));

SISL_OPTIONS_ENABLE(logging, blob_manager_test)
SISL_OPTIONS_ENABLE(logging, test_home_object)

using homeobject::Blob;
using homeobject::blob_id_t;
using homeobject::BlobError;
using homeobject::peer_id_t;

class FixtureApp : public homeobject::HomeObjectApplication {
std::string path_{"/tmp/test_homestore.data." + std::to_string(rand())};
std::string path_{"/tmp/homobject_test.data." + std::to_string(rand())};

public:
FixtureApp() {
Expand All @@ -45,7 +49,7 @@ class FixtureApp : public homeobject::HomeObjectApplication {
uint32_t threads() const override { return 2; }

void clean() {
if (std::filesystem::exists(path_)) { std::filesystem::remove(path_); }
if (std::filesystem::exists(path_)) std::filesystem::remove(path_);
}

std::list< std::filesystem::path > devices() const override {
Expand Down

0 comments on commit e1e728c

Please sign in to comment.