From 67cca17a715f08975ab7f28f211cdfe34963fbeb Mon Sep 17 00:00:00 2001 From: Jie Yao Date: Thu, 22 Feb 2024 03:33:45 -0700 Subject: [PATCH] fix restartability bug for upper layer --- conanfile.py | 2 +- src/lib/replication/service/generic_repl_svc.cpp | 3 +-- src/lib/replication/service/raft_repl_service.cpp | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/conanfile.py b/conanfile.py index 369fcbbdb..61bdfa34f 100644 --- 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 index 240c82623..58dc6c5a0 100644 --- 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 index dc4013034..c9fd1f5b3 100644 --- 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; }