Skip to content
Snippets Groups Projects
Commit 9e32a42c authored by Georgy Moshkin's avatar Georgy Moshkin :speech_balloon:
Browse files

fix: persist more of conf_state

parent 74d3109e
Branches
Tags
1 merge request!151Refactor/more minor changes
Pipeline #7105 passed
...@@ -322,10 +322,21 @@ impl Storage { ...@@ -322,10 +322,21 @@ impl Storage {
Ok(()) Ok(())
} }
pub fn voters() -> Result<Vec<u64>, StorageError> {
Ok(Storage::raft_state("voters")?.unwrap_or_default())
}
pub fn learners() -> Result<Vec<u64>, StorageError> {
Ok(Storage::raft_state("learners")?.unwrap_or_default())
}
pub fn conf_state() -> Result<raft::ConfState, StorageError> { pub fn conf_state() -> Result<raft::ConfState, StorageError> {
Ok(raft::ConfState { Ok(raft::ConfState {
voters: Storage::raft_state("voters")?.unwrap_or_default(), voters: Storage::voters()?,
learners: Storage::raft_state("learners")?.unwrap_or_default(), learners: Storage::learners()?,
voters_outgoing: Storage::raft_state("voters_outgoing")?.unwrap_or_default(),
learners_next: Storage::raft_state("learners_next")?.unwrap_or_default(),
auto_leave: Storage::raft_state("auto_leave")?.unwrap_or_default(),
..Default::default() ..Default::default()
}) })
} }
...@@ -333,6 +344,9 @@ impl Storage { ...@@ -333,6 +344,9 @@ impl Storage {
pub fn persist_conf_state(cs: &raft::ConfState) -> Result<(), StorageError> { pub fn persist_conf_state(cs: &raft::ConfState) -> Result<(), StorageError> {
Storage::persist_raft_state("voters", &cs.voters)?; Storage::persist_raft_state("voters", &cs.voters)?;
Storage::persist_raft_state("learners", &cs.learners)?; Storage::persist_raft_state("learners", &cs.learners)?;
Storage::persist_raft_state("voters_outgoing", &cs.voters_outgoing)?;
Storage::persist_raft_state("learners_next", &cs.learners_next)?;
Storage::persist_raft_state("auto_leave", &cs.auto_leave)?;
Ok(()) Ok(())
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment