diff --git a/conanfile.py b/conanfile.py index 99e129017..bc914e16c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -9,7 +9,7 @@ class HomestoreConan(ConanFile): name = "homestore" - version = "6.5.18" + version = "6.5.19" homepage = "https://github.com/eBay/Homestore" description = "HomeStore Storage Engine" diff --git a/src/lib/replication/repl_dev/raft_repl_dev.cpp b/src/lib/replication/repl_dev/raft_repl_dev.cpp index 2d93c4070..c1f764cb0 100644 --- a/src/lib/replication/repl_dev/raft_repl_dev.cpp +++ b/src/lib/replication/repl_dev/raft_repl_dev.cpp @@ -501,7 +501,7 @@ repl_req_ptr_t RaftReplDev::applier_create_req(repl_key const& rkey, journal_typ // We need to allocate the block, since entry doesn't exist or if it exist, two threads are trying to do the same // thing. So take state mutex and allocate the blk std::unique_lock< std::mutex > lg(rreq->m_state_mtx); - rreq->init(rkey, code, false /* is_proposer */, user_header, key, data_size); + rreq->init(rkey, code, m_raft_server_id == rkey.server_id, user_header, key, data_size); // There is no data portion, so there is not need to allocate if (!rreq->has_linked_data()) { return rreq; } diff --git a/src/lib/replication/repl_dev/raft_state_machine.cpp b/src/lib/replication/repl_dev/raft_state_machine.cpp index 2047a3b28..2f394d34a 100644 --- a/src/lib/replication/repl_dev/raft_state_machine.cpp +++ b/src/lib/replication/repl_dev/raft_state_machine.cpp @@ -154,6 +154,7 @@ 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())) { + RD_LOGE("Should not happen in current implementation! rkey=[{}]", rkey.to_string()); rreq = localize_journal_entry_prepare(lentry); if (rreq == nullptr) { RELEASE_ASSERT(rreq != nullptr,