aboutsummaryrefslogtreecommitdiff
path: root/src/rpc/system.rs
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-09-18 12:17:07 +0200
committerAlex Auvolat <alex@adnab.me>2023-09-18 12:17:07 +0200
commit0088599f52f38ae9e00fe772a416150813e2470b (patch)
tree0f1dcec813cba7ae11d6c2f2f2d9b873963d6662 /src/rpc/system.rs
parent749b4865d0a26c600fef79ab0456c827faafb9e8 (diff)
downloadgarage-0088599f52f38ae9e00fe772a416150813e2470b.tar.gz
garage-0088599f52f38ae9e00fe772a416150813e2470b.zip
new layout: fix clippy lints
Diffstat (limited to 'src/rpc/system.rs')
-rw-r--r--src/rpc/system.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rpc/system.rs b/src/rpc/system.rs
index 8fba9580..7fc3c20c 100644
--- a/src/rpc/system.rs
+++ b/src/rpc/system.rs
@@ -668,7 +668,7 @@ impl System {
let prev_layout_check = layout.check().is_ok();
if layout.merge(adv) {
- if prev_layout_check && !layout.check().is_ok() {
+ if prev_layout_check && layout.check().is_err() {
error!("New cluster layout is invalid, discarding.");
return Err(Error::Message(
"New cluster layout is invalid, discarding.".into(),
@@ -724,7 +724,7 @@ impl System {
async fn discovery_loop(self: &Arc<Self>, mut stop_signal: watch::Receiver<bool>) {
while !*stop_signal.borrow() {
- let not_configured = !self.ring.borrow().layout.check().is_ok();
+ let not_configured = self.ring.borrow().layout.check().is_err();
let no_peers = self.fullmesh.get_peer_list().len() < self.replication_factor;
let expected_n_nodes = self.ring.borrow().layout.num_nodes();
let bad_peers = self