From 4c8c618c8a9686d27e6ba870a868f64cd87f1adf Mon Sep 17 00:00:00 2001
From: Georgy Moshkin <gmoshkin@picodata.io>
Date: Wed, 17 May 2023 11:17:26 +0300
Subject: [PATCH] fix: revert Event::EntryApplied renaming
---
src/traft/event.rs | 2 +-
src/traft/node.rs | 3 +--
src/traft/rpc/sync.rs | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/traft/event.rs b/src/traft/event.rs
index de47502499..09b964f649 100644
--- a/src/traft/event.rs
+++ b/src/traft/event.rs
@@ -25,7 +25,7 @@ pub type BoxResult<T> = std::result::Result<T, Box<dyn std::error::Error>>;
JointStateLeave = "raft.joint-state-leave",
JointStateDrop = "raft.joint-state-drop",
RaftLoopNeeded = "raft.loop-needed",
- CommitIndexPersisted = "raft.commit-index-persisted",
+ EntryApplied = "raft.entry-applied",
MigrateDone = "picodata.migrate-done",
}
}
diff --git a/src/traft/node.rs b/src/traft/node.rs
index 454a8ca282..94ce364eff 100644
--- a/src/traft/node.rs
+++ b/src/traft/node.rs
@@ -694,6 +694,7 @@ impl NodeImpl {
}
let res = self.raft_storage.persist_applied(entry_index);
+ event::broadcast(Event::EntryApplied);
if let Err(e) = res {
tlog!(
Error,
@@ -1305,7 +1306,6 @@ impl NodeImpl {
// Raft HardState changed, and we need to persist it.
if let Some(hs) = ready.hs() {
self.raft_storage.persist_hard_state(hs).unwrap();
- event::broadcast(Event::CommitIndexPersisted);
if let Err(e) = self.status.send_modify(|s| s.term = hs.term) {
tlog!(Warning, "failed updating current term: {e}"; "term" => hs.term)
}
@@ -1331,7 +1331,6 @@ impl NodeImpl {
// Update commit index.
if let Some(commit) = light_rd.commit_index() {
self.raft_storage.persist_commit(commit).unwrap();
- event::broadcast(Event::CommitIndexPersisted);
}
// Apply committed entries.
diff --git a/src/traft/rpc/sync.rs b/src/traft/rpc/sync.rs
index 2e6a711258..2e190576ec 100644
--- a/src/traft/rpc/sync.rs
+++ b/src/traft/rpc/sync.rs
@@ -36,7 +36,7 @@ pub fn wait_for_index_timeout(
}
if let Some(timeout) = deadline.checked_duration_since(Instant::now()) {
- event::wait_timeout(event::Event::CommitIndexPersisted, timeout)?;
+ event::wait_timeout(event::Event::EntryApplied, timeout)?;
} else {
return Err(Error::Timeout);
}
--
GitLab