From e1860de47cfe5eca071eaa6a53e82038e9188399 Mon Sep 17 00:00:00 2001
From: Georgy Moshkin <gmoshkin@picodata.io>
Date: Fri, 21 Oct 2022 12:00:39 +0300
Subject: [PATCH] refactor: Peer::is_active -> Peer::is_online
---
src/traft/failover.rs | 2 +-
src/traft/mod.rs | 2 +-
src/traft/node.rs | 2 +-
src/traft/topology.rs | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/traft/failover.rs b/src/traft/failover.rs
index 5872a6722d..1e6b3342b5 100644
--- a/src/traft/failover.rs
+++ b/src/traft/failover.rs
@@ -30,7 +30,7 @@ pub fn on_shutdown() {
node.storage
.peers
.get(&raft_id)
- .map(|peer| peer.is_active())
+ .map(|peer| peer.is_online())
.unwrap_or(false)
});
let raft_id = node.status().id;
diff --git a/src/traft/mod.rs b/src/traft/mod.rs
index 24a7992004..f8498548bb 100644
--- a/src/traft/mod.rs
+++ b/src/traft/mod.rs
@@ -457,7 +457,7 @@ pub struct Peer {
impl Encode for Peer {}
impl Peer {
- pub fn is_active(&self) -> bool {
+ pub fn is_online(&self) -> bool {
matches!(self.current_grade, CurrentGrade::Online)
}
diff --git a/src/traft/node.rs b/src/traft/node.rs
index c7726aadff..dce2ff8667 100644
--- a/src/traft/node.rs
+++ b/src/traft/node.rs
@@ -906,7 +906,7 @@ fn raft_conf_change(storage: &RaftSpaceAccess, peers: &[Peer]) -> Option<raft::C
HashSet::from_iter(storage.learners().unwrap().unwrap_or_default());
let peer_is_active: HashMap<RaftId, bool> = peers
.iter()
- .map(|peer| (peer.raft_id, peer.is_active()))
+ .map(|peer| (peer.raft_id, peer.is_online()))
.collect();
let (active_voters, to_demote): (Vec<RaftId>, Vec<RaftId>) = voter_ids
diff --git a/src/traft/topology.rs b/src/traft/topology.rs
index 7cd2741feb..eaa19905fc 100644
--- a/src/traft/topology.rs
+++ b/src/traft/topology.rs
@@ -139,7 +139,7 @@ impl Topology {
if let Some(id) = instance_id.as_ref() {
let existing_peer: Option<&Peer> = self.instance_map.get(id);
- if matches!(existing_peer, Some(peer) if peer.is_active()) {
+ if matches!(existing_peer, Some(peer) if peer.is_online()) {
let e = format!("{} is already joined", id);
return Err(e);
}
--
GitLab