fix restartability bug for upper layer

eBay · Feb 22, 2024 · 67cca17 · 67cca17
1 parent 2f5f94d
commit 67cca17
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/conanfile.py b/conanfile.py
@@ -5,7 +5,7 @@
 
 class HomestoreConan(ConanFile):
     name = "homestore"
-    version = "5.1.6"
+    version = "5.1.7"
 
     homepage = "https://github.com/eBay/Homestore"
     description = "HomeStore Storage Engine"

diff --git a/src/lib/replication/service/generic_repl_svc.cpp b/src/lib/replication/service/generic_repl_svc.cpp
@@ -35,8 +35,7 @@ std::shared_ptr< GenericReplService > GenericReplService::create(cshared< ReplAp
     }
 }
 
-GenericReplService::GenericReplService(cshared< ReplApplication >& repl_app) :
-        m_repl_app{repl_app}, m_my_uuid{repl_app->get_my_repl_id()} {
+GenericReplService::GenericReplService(cshared< ReplApplication >& repl_app) : m_repl_app{repl_app} {
     m_sb_bufs.reserve(100);
     meta_service().register_handler(
         get_meta_blk_name(),

diff --git a/src/lib/replication/service/raft_repl_service.cpp b/src/lib/replication/service/raft_repl_service.cpp
@@ -71,6 +71,7 @@ RaftReplService::RaftReplService(cshared< ReplApplication >& repl_app) : Generic
 
 void RaftReplService::start() {
     // Step 1: Initialize the Nuraft messaging service, which starts the nuraft service
+    m_my_uuid = m_repl_app->get_my_repl_id();
     auto params = nuraft_mesg::Manager::Params{
         .server_uuid_ = m_my_uuid,
         .mesg_port_ = m_repl_app->lookup_peer(m_my_uuid).second,
@@ -271,8 +272,6 @@ AsyncReplResult<> RaftReplService::replace_member(group_id_t group_id, replica_i
     return make_async_error<>(ReplServiceError::NOT_IMPLEMENTED);
 }
 
-
-
 ///////////////////// RaftReplService CP Callbacks /////////////////////////////
 std::unique_ptr< CPContext > RaftReplServiceCPHandler::on_switchover_cp(CP* cur_cp, CP* new_cp) { return nullptr; }