From fc4201bbfbac0e4c0b926ae7e8bc19457d869d0d Mon Sep 17 00:00:00 2001
From: Yaroslav Dynnikov <yaroslav.dynnikov@gmail.com>
Date: Wed, 29 Jun 2022 18:06:10 +0300
Subject: [PATCH] chore: rename back active -> is_active
---
src/traft/failover.rs | 2 +-
src/traft/mod.rs | 4 ++--
src/traft/node.rs | 4 ++--
src/traft/storage.rs | 2 +-
src/traft/topology.rs | 6 +++---
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/traft/failover.rs b/src/traft/failover.rs
index c9510fbd37..ca68f1f44d 100644
--- a/src/traft/failover.rs
+++ b/src/traft/failover.rs
@@ -24,7 +24,7 @@ pub fn on_shutdown() {
cluster_id: Storage::cluster_id()
.unwrap()
.expect("cluster_id must be present"),
- active: false,
+ is_active: false,
};
let fn_name = stringify_cfunc!(raft_deactivate);
diff --git a/src/traft/mod.rs b/src/traft/mod.rs
index 18858bce79..08d05ab053 100644
--- a/src/traft/mod.rs
+++ b/src/traft/mod.rs
@@ -144,7 +144,7 @@ pub struct Peer {
pub commit_index: u64,
/// Is this instance active. Instances become inactive when they shut down.
- pub active: bool,
+ pub is_active: bool,
}
impl AsTuple for Peer {}
@@ -432,7 +432,7 @@ impl AsTuple for JoinResponse {}
pub struct SetActiveRequest {
pub cluster_id: String,
pub instance_id: String,
- pub active: bool,
+ pub is_active: bool,
}
impl AsTuple for SetActiveRequest {}
diff --git a/src/traft/node.rs b/src/traft/node.rs
index 40097a2790..9f273fa4d7 100644
--- a/src/traft/node.rs
+++ b/src/traft/node.rs
@@ -594,7 +594,7 @@ fn raft_main_loop(
TopologyRequest::SetActive(SetActiveRequest {
instance_id,
- active,
+ is_active: active,
..
}) => topology.set_active(instance_id, active),
};
@@ -887,7 +887,7 @@ fn raft_conf_change_loop(
let peers: HashMap<RaftId, bool> = Storage::peers()
.unwrap()
.iter()
- .map(|peer| (peer.raft_id, peer.active))
+ .map(|peer| (peer.raft_id, peer.is_active))
.collect();
let mut changes: Vec<raft::ConfChangeSingle> = Vec::new();
diff --git a/src/traft/storage.rs b/src/traft/storage.rs
index 29a6f6238c..5fded69f0d 100644
--- a/src/traft/storage.rs
+++ b/src/traft/storage.rs
@@ -79,7 +79,7 @@ impl Storage {
{name = 'replicaset_id', type = 'string', is_nullable = false},
{name = 'replicaset_uuid', type = 'string', is_nullable = false},
{name = 'commit_index', type = 'unsigned', is_nullable = false},
- {name = 'active', type = 'boolean', is_nullable = false},
+ {name = 'is_active', type = 'boolean', is_nullable = false},
}
})
diff --git a/src/traft/topology.rs b/src/traft/topology.rs
index ba065d0a2b..45e818a673 100644
--- a/src/traft/topology.rs
+++ b/src/traft/topology.rs
@@ -87,7 +87,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.active) {
+ if matches!(existing_peer, Some(peer) if peer.is_active) {
let e = format!("{} is already joined", id);
return Err(e);
}
@@ -108,7 +108,7 @@ impl Topology {
replicaset_id,
replicaset_uuid,
commit_index: INVALID_INDEX,
- active: true,
+ is_active: true,
};
self.put_peer(peer.clone());
@@ -136,7 +136,7 @@ impl Topology {
.get_mut(&instance_id)
.ok_or_else(|| format!("unknown instance {}", instance_id))?;
- peer.active = active;
+ peer.is_active = active;
Ok(peer.clone())
}
}
--
GitLab