aboutsummaryrefslogtreecommitdiff
path: root/src/rpc/layout
diff options
context:
space:
mode:
Diffstat (limited to 'src/rpc/layout')
-rw-r--r--src/rpc/layout/helper.rs2
-rw-r--r--src/rpc/layout/history.rs14
-rw-r--r--src/rpc/layout/mod.rs2
-rw-r--r--src/rpc/layout/version.rs6
4 files changed, 11 insertions, 13 deletions
diff --git a/src/rpc/layout/helper.rs b/src/rpc/layout/helper.rs
index 2ba010b8..7e5d37e9 100644
--- a/src/rpc/layout/helper.rs
+++ b/src/rpc/layout/helper.rs
@@ -129,7 +129,7 @@ impl LayoutHelper {
where
F: FnOnce(&mut LayoutHistory) -> bool,
{
- let changed = f(&mut self.layout.as_mut().unwrap());
+ let changed = f(self.layout.as_mut().unwrap());
if changed {
*self = Self::new(
self.replication_mode,
diff --git a/src/rpc/layout/history.rs b/src/rpc/layout/history.rs
index a53256cc..23196aee 100644
--- a/src/rpc/layout/history.rs
+++ b/src/rpc/layout/history.rs
@@ -42,8 +42,7 @@ impl LayoutHistory {
let set = self
.versions
.iter()
- .map(|x| x.all_nodes())
- .flatten()
+ .flat_map(|x| x.all_nodes())
.collect::<HashSet<_>>();
set.into_iter().copied().collect::<Vec<_>>()
}
@@ -56,8 +55,7 @@ impl LayoutHistory {
let set = self
.versions
.iter()
- .map(|x| x.nongateway_nodes())
- .flatten()
+ .flat_map(|x| x.nongateway_nodes())
.collect::<HashSet<_>>();
set.into_iter().copied().collect::<Vec<_>>()
}
@@ -94,7 +92,7 @@ impl LayoutHistory {
let sync_ack_map_min = self
.update_trackers
.sync_ack_map
- .min_among(&current_nodes, min_version);
+ .min_among(current_nodes, min_version);
if self.min_stored() < sync_ack_map_min {
let removed = self.versions.remove(0);
info!(
@@ -144,7 +142,7 @@ impl LayoutHistory {
let global_min = self
.update_trackers
.sync_map
- .min_among(&all_nongateway_nodes, min_version);
+ .min_among(all_nongateway_nodes, min_version);
// If the write quorums are equal to the total number of nodes,
// i.e. no writes can succeed while they are not written to all nodes,
@@ -281,7 +279,7 @@ To know the correct value of the new layout version, invoke `garage layout show`
let (new_version, msg) = self
.current()
.clone()
- .calculate_next_version(&self.staging.get())?;
+ .calculate_next_version(self.staging.get())?;
self.versions.push(new_version);
self.cleanup_old_versions();
@@ -297,7 +295,7 @@ To know the correct value of the new layout version, invoke `garage layout show`
pub fn revert_staged_changes(mut self) -> Result<Self, Error> {
self.staging.update(LayoutStaging {
- parameters: Lww::new(self.current().parameters.clone()),
+ parameters: Lww::new(self.current().parameters),
roles: LwwMap::new(),
});
diff --git a/src/rpc/layout/mod.rs b/src/rpc/layout/mod.rs
index facdb2ce..162e3c6e 100644
--- a/src/rpc/layout/mod.rs
+++ b/src/rpc/layout/mod.rs
@@ -357,7 +357,7 @@ mod v010 {
update_trackers: UpdateTrackers {
ack_map: update_tracker.clone(),
sync_map: update_tracker.clone(),
- sync_ack_map: update_tracker.clone(),
+ sync_ack_map: update_tracker,
},
staging: Lww::raw(previous.version, staging),
}
diff --git a/src/rpc/layout/version.rs b/src/rpc/layout/version.rs
index 5b307156..ee4b2821 100644
--- a/src/rpc/layout/version.rs
+++ b/src/rpc/layout/version.rs
@@ -137,19 +137,19 @@ impl LayoutVersion {
// ===================== internal information extractors ======================
pub(crate) fn expect_get_node_capacity(&self, uuid: &Uuid) -> u64 {
- self.get_node_capacity(&uuid)
+ self.get_node_capacity(uuid)
.expect("non-gateway node with zero capacity")
}
pub(crate) fn expect_get_node_zone(&self, uuid: &Uuid) -> &str {
- self.get_node_zone(&uuid).expect("node without a zone")
+ self.get_node_zone(uuid).expect("node without a zone")
}
/// Returns the sum of capacities of non gateway nodes in the cluster
fn get_total_capacity(&self) -> u64 {
let mut total_capacity = 0;
for uuid in self.nongateway_nodes() {
- total_capacity += self.expect_get_node_capacity(&uuid);
+ total_capacity += self.expect_get_node_capacity(uuid);
}
total_capacity
}