From 94bf6b9966c267fdc65c3d553a99fc112d69e68e Mon Sep 17 00:00:00 2001 From: yawzhang Date: Tue, 26 Nov 2024 18:03:36 +0800 Subject: [PATCH] Define is_proposer by comparing m_raft_server_id with rkey.server_id --- conanfile.py | 3 +-- src/lib/replication/repl_dev/raft_state_machine.cpp | 12 +++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/conanfile.py b/conanfile.py index 087d8ca98..8c434e7fb 100644 --- a/conanfile.py +++ b/conanfile.py @@ -9,8 +9,7 @@ class HomestoreConan(ConanFile): name = "homestore" - version = "6.6.1" - + version = "6.6.2" homepage = "https://github.com/eBay/Homestore" description = "HomeStore Storage Engine" topics = ("ebay", "nublox") diff --git a/src/lib/replication/repl_dev/raft_state_machine.cpp b/src/lib/replication/repl_dev/raft_state_machine.cpp index 10fb9285f..2d036170e 100644 --- a/src/lib/replication/repl_dev/raft_state_machine.cpp +++ b/src/lib/replication/repl_dev/raft_state_machine.cpp @@ -154,15 +154,9 @@ repl_req_ptr_t RaftStateMachine::localize_journal_entry_finish(nuraft::log_entry auto rreq = m_rd.repl_key_to_req(rkey); if ((rreq == nullptr) || (rreq->is_localize_pending())) { - rreq = localize_journal_entry_prepare(lentry); - if (rreq == nullptr) { - RELEASE_ASSERT(rreq != nullptr, - "We get an linked data for rkey=[{}], jentry=[{}] not as part of Raft Append but " - "indirectly through possibly unpack() and in those cases, if we are not able to alloc " - "location to write the data, there is no recourse. So we must crash this system ", - rkey.to_string(), jentry->to_string()); - return nullptr; - } + // This path is for log pack apply only. + // Now we fully disabled log pack/unpack with the new_learner opt, should not reaching here. + RELEASE_ASSERT(false, "rreq should have already localized for rkey=[{}]", rkey.to_string()); } if (rreq->is_proposer()) {