layout: refactoring of all_nodes

3 files changed, 23 insertions, 11 deletions

diff --git a/src/rpc/layout/history.rs b/src/rpc/layout/history.rs
index 877ad3a7..69348873 100644
--- a/src/rpc/layout/history.rs
+++ b/src/rpc/layout/history.rs
@@ -60,6 +60,21 @@ impl LayoutHistory {
 		(self.current().version, self.all_ack(), self.min_stored())
 	}
 
+	pub fn all_nodes(&self) -> Cow<'_, [Uuid]> {
+		// TODO: cache this
+		if self.versions.len() == 1 {
+			self.versions[0].all_nodes().into()
+		} else {
+			let set = self
+				.versions
+				.iter()
+				.map(|x| x.all_nodes())
+				.flatten()
+				.collect::<HashSet<_>>();
+			set.into_iter().copied().collect::<Vec<_>>().into()
+		}
+	}
+
 	pub fn all_nongateway_nodes(&self) -> Cow<'_, [Uuid]> {
 		// TODO: cache this
 		if self.versions.len() == 1 {
diff --git a/src/rpc/layout/version.rs b/src/rpc/layout/version.rs
index a7f387b6..2cbdcee2 100644
--- a/src/rpc/layout/version.rs
+++ b/src/rpc/layout/version.rs
@@ -38,22 +38,19 @@ impl LayoutVersion {
 
 	// ===================== accessors ======================
 
-	/// Returns a list of IDs of nodes that currently have
-	/// a role in the cluster
-	pub fn node_ids(&self) -> &[Uuid] {
+	/// Returns a list of IDs of nodes that have a role in this
+	/// version of the cluster layout, including gateway nodes
+	pub fn all_nodes(&self) -> &[Uuid] {
 		&self.node_id_vec[..]
 	}
 
-	/// Returns the uuids of the non_gateway nodes in self.node_id_vec.
+	/// Returns a list of IDs of nodes that have a storage capacity
+	/// assigned in this version of the cluster layout
 	pub fn nongateway_nodes(&self) -> &[Uuid] {
 		&self.node_id_vec[..self.nongateway_node_count]
 	}
 
-	pub fn num_nodes(&self) -> usize {
-		self.node_id_vec.len()
-	}
-
-	/// Returns the role of a node in the layout
+	/// Returns the role of a node in the layout, if it has one
 	pub fn node_role(&self, node: &Uuid) -> Option<&NodeRole> {
 		match self.roles.get(node) {
 			Some(NodeRoleV(Some(v))) => Some(v),
@@ -61,7 +58,7 @@ impl LayoutVersion {
 		}
 	}
 
-	/// Given a node uuids, this function returns its capacity or fails if it does not have any
+	/// Returns the capacity of a node in the layout, if it has one
 	pub fn get_node_capacity(&self, uuid: &Uuid) -> Option<u64> {
 		match self.node_role(uuid) {
 			Some(NodeRole {
diff --git a/src/rpc/system.rs b/src/rpc/system.rs
index 3418600b..ab3c96b8 100644
--- a/src/rpc/system.rs
+++ b/src/rpc/system.rs
@@ -609,7 +609,7 @@ impl System {
 		while !*stop_signal.borrow() {
 			let not_configured = self.cluster_layout().check().is_err();
 			let no_peers = self.fullmesh.get_peer_list().len() < self.replication_factor;
-			let expected_n_nodes = self.cluster_layout().current().num_nodes();
+			let expected_n_nodes = self.cluster_layout().all_nodes().len();
 			let bad_peers = self
 				.fullmesh
 				.get_peer_list()