From acd14723d51038286f6dc897e09ddcb8a24ab538 Mon Sep 17 00:00:00 2001
From: Valentin Syrovatskiy <v.syrovatskiy@picodata.io>
Date: Thu, 20 Oct 2022 16:41:39 +0300
Subject: [PATCH] refactor: replace pseudo-loop with direct return
---
src/traft/node.rs | 45 +++++++++++++++++++--------------------------
1 file changed, 19 insertions(+), 26 deletions(-)
diff --git a/src/traft/node.rs b/src/traft/node.rs
index cf58db4fac..33a86272d9 100644
--- a/src/traft/node.rs
+++ b/src/traft/node.rs
@@ -487,34 +487,27 @@ impl NodeImpl {
// In some states proposing a ConfChange is impossible.
// Check if there's a reason to reject it.
- #[allow(clippy::never_loop)]
- let reason: Option<&str> = loop {
- // Checking leadership is only needed for the
- // correct latch management. It doesn't affect
- // raft correctness. Checking the instance is a
- // leader makes sure the proposed `ConfChange`
- // is appended to the raft log immediately
- // instead of sending `MsgPropose` over the
- // network.
- if self.raw_node.raft.state != RaftStateRole::Leader {
- break Some("not a leader");
- }
-
- if term != self.raw_node.raft.term {
- break Some("raft term mismatch");
- }
-
- // Without this check the node would silently ignore the conf change.
- // See https://github.com/tikv/raft-rs/blob/v0.6.0/src/raft.rs#L2014-L2026
- if self.raw_node.raft.has_pending_conf() {
- break Some("already has pending confchange");
- }
+ // Checking leadership is only needed for the
+ // correct latch management. It doesn't affect
+ // raft correctness. Checking the instance is a
+ // leader makes sure the proposed `ConfChange`
+ // is appended to the raft log immediately
+ // instead of sending `MsgPropose` over the
+ // network.
+ if self.raw_node.raft.state != RaftStateRole::Leader {
+ return Err(RaftError::ConfChangeError("not a leader".into()));
+ }
- break None;
- };
+ if term != self.raw_node.raft.term {
+ return Err(RaftError::ConfChangeError("raft term mismatch".into()));
+ }
- if let Some(e) = reason {
- return Err(RaftError::ConfChangeError(e.into()));
+ // Without this check the node would silently ignore the conf change.
+ // See https://github.com/tikv/raft-rs/blob/v0.6.0/src/raft.rs#L2014-L2026
+ if self.raw_node.raft.has_pending_conf() {
+ return Err(RaftError::ConfChangeError(
+ "already has pending confchange".into(),
+ ));
}
let prev_index = self.raw_node.raft.raft_log.last_index();
--
GitLab