Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class HomestoreConan(ConanFile):
name = "homestore"
version = "6.20.23"
version = "6.20.24"

homepage = "https://github.com/eBay/Homestore"
description = "HomeStore Storage Engine"
Expand Down
3 changes: 3 additions & 0 deletions src/include/homestore/replication_service.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ class ReplApplication {

// Get the current application/server repl uuid
virtual replica_id_t get_my_repl_id() const = 0;

// Get the current replication service port
virtual uint32_t get_my_repl_svc_port() const = 0;
};

} // namespace homestore
2 changes: 1 addition & 1 deletion src/lib/replication/service/raft_repl_service.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ void RaftReplService::start() {
std::string ssl_ca_file = HS_DYNAMIC_CONFIG(consensus.ssl_ca_file);
auto params = nuraft_mesg::Manager::Params{
.server_uuid_ = m_my_uuid,
.mesg_port_ = m_repl_app->lookup_peer(m_my_uuid).second,
.mesg_port_ = static_cast< uint16_t >(m_repl_app->get_my_repl_svc_port()),
.default_group_type_ = "homestore_replication",
.ssl_key_ = ioenvironment.get_ssl_key(),
.ssl_cert_ = ioenvironment.get_ssl_cert(),
Expand Down
3 changes: 3 additions & 0 deletions src/tests/test_common/hs_repl_test_common.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@ class HSReplTestHelper : public HSTestHelper {
}

homestore::replica_id_t get_my_repl_id() const override { return helper_.my_replica_id_; }
uint32_t get_my_repl_svc_port() const override {
return SISL_OPTIONS["base_port"].as< uint16_t >() + helper_.replica_num_;
}
};

public:
Expand Down
1 change: 1 addition & 0 deletions src/tests/test_solo_repl_dev.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ class SoloReplDevTest : public testing::Test {
void on_repl_devs_init_completed() { LOGINFO("Repl dev init completed CB called"); }
std::pair< std::string, uint16_t > lookup_peer(uuid_t uuid) const override { return std::make_pair("", 0u); }
replica_id_t get_my_repl_id() const override { return hs_utils::gen_random_uuid(); }
uint32_t get_my_repl_svc_port() const override { return 0; }
};

protected:
Expand Down
Loading