diff --git a/conanfile.py b/conanfile.py index 49251325c..ca31ef1b6 100644 --- a/conanfile.py +++ b/conanfile.py @@ -9,7 +9,7 @@ class HomestoreConan(ConanFile): name = "homestore" - version = "6.4.48" + version = "6.4.49" 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 7a79ad8a5..dd20354d7 100644 --- a/src/lib/replication/repl_dev/raft_repl_dev.cpp +++ b/src/lib/replication/repl_dev/raft_repl_dev.cpp @@ -1180,7 +1180,7 @@ void RaftReplDev::on_log_found(logstore_seq_num_t lsn, log_buffer buf, void* ctx } // 2. Pre-commit the log entry - m_listener->on_pre_commit(repl_lsn, entry_to_hdr(jentry), entry_to_key(jentry), nullptr); + m_listener->on_pre_commit(rreq->lsn(), rreq->header(), rreq->key(), rreq); // 3. Commit the log entry handle_commit(rreq, true /* recovery */); diff --git a/src/lib/replication/repl_dev/raft_state_machine.cpp b/src/lib/replication/repl_dev/raft_state_machine.cpp index e342cd72e..12a9be312 100644 --- a/src/lib/replication/repl_dev/raft_state_machine.cpp +++ b/src/lib/replication/repl_dev/raft_state_machine.cpp @@ -222,10 +222,10 @@ void RaftStateMachine::unlink_lsn_to_req(int64_t lsn) { void RaftStateMachine::link_lsn_to_req(repl_req_ptr_t rreq, int64_t lsn) { rreq->set_lsn(lsn); rreq->add_state(repl_req_state_t::LOG_RECEIVED); - [[maybe_unused]] auto r = m_lsn_req_map.insert(lsn, std::move(rreq)); - RD_DBG_ASSERT_EQ(r.second, true, "lsn={} already in precommit list", lsn); // reset the rreq created_at time to now https://github.com/eBay/HomeStore/issues/506 rreq->set_created_time(); + [[maybe_unused]] auto r = m_lsn_req_map.insert(lsn, std::move(rreq)); + RD_DBG_ASSERT_EQ(r.second, true, "lsn={} already in precommit list", lsn); } repl_req_ptr_t RaftStateMachine::lsn_to_req(int64_t lsn) {