audron/garage
1
0
Fork 0
forked from Deuxfleurs/garage
Code Issues Pull requests Projects Releases Wiki Activity

corrected warnings of cargo clippy

Browse source
This commit is contained in:
Mendes 2022-10-06 14:53:57 +02:00
parent 9407df60cc
commit 911eb17bd9
2 changed files with 66 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/rpc/graph_algo.rs
View file

@ -59,10 +59,10 @@ pub type CostFunction = HashMap<(Vertex,Vertex), i32>;
impl<E : Edge> Graph<E>{ impl<E : Edge> Graph<E>{
pub fn new(vertices : &[Vertex]) -> Self { pub fn new(vertices : &[Vertex]) -> Self {
let mut map = HashMap::<Vertex, usize>::new(); let mut map = HashMap::<Vertex, usize>::new();
for i in 0..vertices.len() { for (i, vert) in vertices.iter().enumerate(){
map.insert(vertices[i] , i); map.insert(*vert , i);
} }
return Graph::<E> { Graph::<E> {
vertextoid : map, vertextoid : map,
idtovertex: vertices.to_vec(), idtovertex: vertices.to_vec(),
graph : vec![Vec::< E >::new(); vertices.len() ] graph : vec![Vec::< E >::new(); vertices.len() ]
@ -99,7 +99,7 @@ impl Graph<FlowEdge>{
result.push(self.idtovertex[edge.dest]); result.push(self.idtovertex[edge.dest]);
} }
} }
return Ok(result); Ok(result)
} }
@ -113,7 +113,7 @@ impl Graph<FlowEdge>{
for edge in self.graph[idv].iter() { for edge in self.graph[idv].iter() {
result += max(0,self.graph[edge.dest][edge.rev].flow); result += max(0,self.graph[edge.dest][edge.rev].flow);
} }
return Ok(result); Ok(result)
} }
//This function returns the value of the flow outgoing from v. //This function returns the value of the flow outgoing from v.
@ -126,13 +126,13 @@ impl Graph<FlowEdge>{
for edge in self.graph[idv].iter() { for edge in self.graph[idv].iter() {
result += max(0,edge.flow); result += max(0,edge.flow);
} }
return Ok(result); Ok(result)
} }
//This function computes the flow total value by computing the outgoing flow //This function computes the flow total value by computing the outgoing flow
//from the source. //from the source.
pub fn get_flow_value(&mut self) -> Result<i32, String> { pub fn get_flow_value(&mut self) -> Result<i32, String> {
return self.get_outflow(Vertex::Source); self.get_outflow(Vertex::Source)
} }
//This function shuffles the order of the edge lists. It keeps the ids of the //This function shuffles the order of the edge lists. It keeps the ids of the
@ -157,7 +157,7 @@ impl Graph<FlowEdge>{
for edge in self.graph[idsource].iter(){ for edge in self.graph[idsource].iter(){
flow_upper_bound += edge.cap; flow_upper_bound += edge.cap;
} }
return flow_upper_bound; flow_upper_bound
} }
//This function computes the maximal flow using Dinic's algorithm. It starts with //This function computes the maximal flow using Dinic's algorithm. It starts with
@ -270,7 +270,7 @@ impl Graph<FlowEdge>{
//We build the weighted graph g where we will look for negative cycle //We build the weighted graph g where we will look for negative cycle
let mut gf = self.build_cost_graph(cost)?; let mut gf = self.build_cost_graph(cost)?;
let mut cycles = gf.list_negative_cycles(path_length); let mut cycles = gf.list_negative_cycles(path_length);
while cycles.len() > 0 { while !cycles.is_empty() {
//we enumerate negative cycles //we enumerate negative cycles
for c in cycles.iter(){ for c in cycles.iter(){
for i in 0..c.len(){ for i in 0..c.len(){
@ -293,7 +293,7 @@ impl Graph<FlowEdge>{
gf = self.build_cost_graph(cost)?; gf = self.build_cost_graph(cost)?;
cycles = gf.list_negative_cycles(path_length); cycles = gf.list_negative_cycles(path_length);
} }
return Ok(()); Ok(())
} }
//Construct the weighted graph G_f from the flow and the cost function //Construct the weighted graph G_f from the flow and the cost function
@ -319,7 +319,7 @@ impl Graph<FlowEdge>{
} }
} }
} }
return Ok(g); Ok(g)
} }
@ -334,7 +334,7 @@ impl Graph<WeightedEdge>{
} }
let idu = self.vertextoid[&u]; let idu = self.vertextoid[&u];
let idv = self.vertextoid[&v]; let idv = self.vertextoid[&v];
self.graph[idu].push( WeightedEdge{w: w , dest: idv} ); self.graph[idu].push( WeightedEdge{ w , dest: idv} );
Ok(()) Ok(())
} }
@ -415,7 +415,7 @@ fn cycles_of_1_forest(forest: &[Option<usize>]) -> Vec<Vec<usize>> {
cycles.push(cy); cycles.push(cy);
} }
} }
return cycles; cycles
} }

105
src/rpc/layout.rs
View file

@ -56,7 +56,7 @@ pub struct ClusterLayout {
} }
fn default_partition_size() -> u32{ fn default_partition_size() -> u32{
return 0; 0
} }
fn default_layout_parameters() -> Lww<LayoutParameters>{ fn default_layout_parameters() -> Lww<LayoutParameters>{
@ -107,15 +107,15 @@ impl NodeRole {
pub fn tags_string(&self) -> String { pub fn tags_string(&self) -> String {
let mut tags = String::new(); let mut tags = String::new();
if self.tags.len() == 0 { if self.tags.is_empty() {
return tags return tags
} }
tags.push_str(&self.tags[0].clone()); tags.push_str(&self.tags[0].clone());
for t in 1..self.tags.len(){ for t in 1..self.tags.len(){
tags.push_str(","); tags.push(',');
tags.push_str(&self.tags[t].clone()); tags.push_str(&self.tags[t].clone());
} }
return tags; tags
} }
} }
@ -246,22 +246,22 @@ To know the correct value of the new layout version, invoke `garage layout show`
_ => () _ => ()
} }
} }
return result; result
} }
///Given a node uuids, this function returns the label of its zone ///Given a node uuids, this function returns the label of its zone
pub fn get_node_zone(&self, uuid : &Uuid) -> Result<String,Error> { pub fn get_node_zone(&self, uuid : &Uuid) -> Result<String,Error> {
match self.node_role(uuid) { match self.node_role(uuid) {
Some(role) => return Ok(role.zone.clone()), Some(role) => Ok(role.zone.clone()),
_ => return Err(Error::Message("The Uuid does not correspond to a node present in the cluster.".into())) _ => Err(Error::Message("The Uuid does not correspond to a node present in the cluster.".into()))
} }
} }
///Given a node uuids, this function returns its capacity or fails if it does not have any ///Given a node uuids, this function returns its capacity or fails if it does not have any
pub fn get_node_capacity(&self, uuid : &Uuid) -> Result<u32,Error> { pub fn get_node_capacity(&self, uuid : &Uuid) -> Result<u32,Error> {
match self.node_role(uuid) { match self.node_role(uuid) {
Some(NodeRole{capacity : Some(cap), zone: _, tags: _}) => return Ok(*cap), Some(NodeRole{capacity : Some(cap), zone: _, tags: _}) => Ok(*cap),
_ => return Err(Error::Message("The Uuid does not correspond to a node present in the \ _ => Err(Error::Message("The Uuid does not correspond to a node present in the \
cluster or this node does not have a positive capacity.".into())) cluster or this node does not have a positive capacity.".into()))
} }
} }
@ -272,7 +272,7 @@ To know the correct value of the new layout version, invoke `garage layout show`
for uuid in self.useful_nodes().iter() { for uuid in self.useful_nodes().iter() {
total_capacity += self.get_node_capacity(uuid)?; total_capacity += self.get_node_capacity(uuid)?;
} }
return Ok(total_capacity); Ok(total_capacity)
} }
@ -341,10 +341,10 @@ To know the correct value of the new layout version, invoke `garage layout show`
for n in self.ring_assignation_data.iter() { for n in self.ring_assignation_data.iter() {
node_usage[*n as usize] += 1; node_usage[*n as usize] += 1;
} }
for n in 0..MAX_NODE_NUMBER { for (n, usage) in node_usage.iter().enumerate(){
if node_usage[n] > 0 { if *usage > 0 {
let uuid = self.node_id_vec[n]; let uuid = self.node_id_vec[n];
if node_usage[n]*self.partition_size > self.get_node_capacity(&uuid) if usage*self.partition_size > self.get_node_capacity(&uuid)
.expect("Critical Error"){ .expect("Critical Error"){
return false; return false;
} }
@ -435,7 +435,7 @@ impl ClusterLayout {
let mut gflow = self.compute_candidate_assignment( &zone_to_id, &old_assignation_opt)?; let mut gflow = self.compute_candidate_assignment( &zone_to_id, &old_assignation_opt)?;
if let Some(assoc) = &old_assignation_opt { if let Some(assoc) = &old_assignation_opt {
//We minimize the distance to the previous assignment. //We minimize the distance to the previous assignment.
self.minimize_rebalance_load(&mut gflow, &zone_to_id, &assoc)?; self.minimize_rebalance_load(&mut gflow, &zone_to_id, assoc)?;
} }
msg.append(&mut self.output_stat(&gflow, &old_assignation_opt, &zone_to_id,&id_to_zone)?); msg.append(&mut self.output_stat(&gflow, &old_assignation_opt, &zone_to_id,&id_to_zone)?);
@ -443,7 +443,7 @@ impl ClusterLayout {
//We update the layout structure //We update the layout structure
self.update_ring_from_flow(id_to_zone.len() , &gflow)?; self.update_ring_from_flow(id_to_zone.len() , &gflow)?;
return Ok(msg); Ok(msg)
} }
/// The LwwMap of node roles might have changed. This function updates the node_id_vec /// The LwwMap of node roles might have changed. This function updates the node_id_vec
@ -456,21 +456,18 @@ impl ClusterLayout {
//Non gateway nodes should be coded on 8bits, hence they must be first in the list //Non gateway nodes should be coded on 8bits, hence they must be first in the list
//We build the new node ids //We build the new node ids
let mut new_non_gateway_nodes: Vec<Uuid> = self.roles.items().iter() let mut new_non_gateway_nodes: Vec<Uuid> = self.roles.items().iter()
.filter(|(_, _, v)| .filter(|(_, _, v)| matches!(&v.0, Some(r) if r.capacity != None))
match &v.0 {Some(r) if r.capacity != None => true, _=> false })
.map(|(k, _, _)| *k).collect(); .map(|(k, _, _)| *k).collect();
if new_non_gateway_nodes.len() > MAX_NODE_NUMBER { if new_non_gateway_nodes.len() > MAX_NODE_NUMBER {
return Err(Error::Message(format!("There are more than {} non-gateway nodes in the new \ return Err(Error::Message(format!("There are more than {} non-gateway nodes in the new \
layout. This is not allowed.", MAX_NODE_NUMBER).into() )); layout. This is not allowed.", MAX_NODE_NUMBER) ));
} }
let mut new_gateway_nodes: Vec<Uuid> = self.roles.items().iter() let mut new_gateway_nodes: Vec<Uuid> = self.roles.items().iter()
.filter(|(_, _, v)| .filter(|(_, _, v)| matches!(v, NodeRoleV(Some(r)) if r.capacity == None))
match v {NodeRoleV(Some(r)) if r.capacity == None => true, _=> false })
.map(|(k, _, _)| *k).collect(); .map(|(k, _, _)| *k).collect();
let nb_useful_nodes = new_non_gateway_nodes.len();
let mut new_node_id_vec = Vec::<Uuid>::new(); let mut new_node_id_vec = Vec::<Uuid>::new();
new_node_id_vec.append(&mut new_non_gateway_nodes); new_node_id_vec.append(&mut new_non_gateway_nodes);
new_node_id_vec.append(&mut new_gateway_nodes); new_node_id_vec.append(&mut new_gateway_nodes);
@ -484,7 +481,7 @@ impl ClusterLayout {
let nb_partitions = 1usize << PARTITION_BITS; let nb_partitions = 1usize << PARTITION_BITS;
let mut old_assignation = vec![ Vec::<usize>::new() ; nb_partitions]; let mut old_assignation = vec![ Vec::<usize>::new() ; nb_partitions];
if self.ring_assignation_data.len() == 0 { if self.ring_assignation_data.is_empty() {
//This is a new association //This is a new association
return Ok(None); return Ok(None);
} }
@ -498,16 +495,16 @@ impl ClusterLayout {
//We add the indices of only the new non-gateway nodes that can be used in the //We add the indices of only the new non-gateway nodes that can be used in the
//association ring //association ring
for i in 0..nb_useful_nodes { for (i, uuid) in new_node_id_vec.iter().enumerate() {
uuid_to_new_id.insert(new_node_id_vec[i], i ); uuid_to_new_id.insert(*uuid, i );
} }
let rf= self.replication_factor; let rf= self.replication_factor;
for p in 0..nb_partitions { for (p, old_assign_p) in old_assignation.iter_mut().enumerate() {
for old_id in &self.ring_assignation_data[p*rf..(p+1)*rf] { for old_id in &self.ring_assignation_data[p*rf..(p+1)*rf] {
let uuid = old_node_id_vec[*old_id as usize]; let uuid = old_node_id_vec[*old_id as usize];
if uuid_to_new_id.contains_key(&uuid) { if uuid_to_new_id.contains_key(&uuid) {
old_assignation[p].push(uuid_to_new_id[&uuid]); old_assign_p.push(uuid_to_new_id[&uuid]);
} }
} }
} }
@ -515,7 +512,7 @@ impl ClusterLayout {
//We write the ring //We write the ring
self.ring_assignation_data = Vec::<CompactNodeType>::new(); self.ring_assignation_data = Vec::<CompactNodeType>::new();
return Ok(Some(old_assignation)); Ok(Some(old_assignation))
} }
@ -530,15 +527,14 @@ impl ClusterLayout {
return Err(Error::Message("The uuid was not found in the node roles (this should \ return Err(Error::Message("The uuid was not found in the node roles (this should \
not happen, it might be a critical error).".into())); not happen, it might be a critical error).".into()));
} }
match self.node_role(&uuid) { if let Some(r) = self.node_role(uuid) {
Some(r) => if !zone_to_id.contains_key(&r.zone) && r.capacity != None { if !zone_to_id.contains_key(&r.zone) && r.capacity != None {
zone_to_id.insert(r.zone.clone() , id_to_zone.len()); zone_to_id.insert(r.zone.clone() , id_to_zone.len());
id_to_zone.push(r.zone.clone()); id_to_zone.push(r.zone.clone());
} }
_ => ()
} }
} }
return Ok((id_to_zone, zone_to_id)); Ok((id_to_zone, zone_to_id))
} }
///This function computes by dichotomy the largest realizable partition size, given ///This function computes by dichotomy the largest realizable partition size, given
@ -566,7 +562,7 @@ impl ClusterLayout {
} }
} }
return Ok(s_down); Ok(s_down)
} }
fn generate_graph_vertices(nb_zones : usize, nb_nodes : usize) -> Vec<Vertex> { fn generate_graph_vertices(nb_zones : usize, nb_nodes : usize) -> Vec<Vertex> {
@ -581,7 +577,7 @@ impl ClusterLayout {
for n in 0..nb_nodes { for n in 0..nb_nodes {
vertices.push(Vertex::N(n)); vertices.push(Vertex::N(n));
} }
return vertices; vertices
} }
fn generate_flow_graph(&self, size: u32, zone_to_id: &HashMap<String, usize>, exclude_assoc : &HashSet<(usize,usize)>) -> Result<Graph<FlowEdge>, Error> { fn generate_flow_graph(&self, size: u32, zone_to_id: &HashMap<String, usize>, exclude_assoc : &HashSet<(usize,usize)>) -> Result<Graph<FlowEdge>, Error> {
@ -609,7 +605,7 @@ impl ClusterLayout {
} }
} }
} }
return Ok(g); Ok(g)
} }
@ -620,11 +616,11 @@ impl ClusterLayout {
let mut exclude_edge = HashSet::<(usize,usize)>::new(); let mut exclude_edge = HashSet::<(usize,usize)>::new();
if let Some(old_assoc) = old_assoc_opt { if let Some(old_assoc) = old_assoc_opt {
let nb_nodes = self.useful_nodes().len(); let nb_nodes = self.useful_nodes().len();
for p in 0..NB_PARTITIONS { for (p, old_assoc_p) in old_assoc.iter().enumerate() {
for n in 0..nb_nodes { for n in 0..nb_nodes {
exclude_edge.insert((p,n)); exclude_edge.insert((p,n));
} }
for n in old_assoc[p].iter() { for n in old_assoc_p.iter() {
exclude_edge.remove(&(p,*n)); exclude_edge.remove(&(p,*n));
} }
} }
@ -638,13 +634,13 @@ impl ClusterLayout {
g.add_edge(Vertex::PZ(*p,node_zone), Vertex::N(*n), 1)?; g.add_edge(Vertex::PZ(*p,node_zone), Vertex::N(*n), 1)?;
} }
g.compute_maximal_flow()?; g.compute_maximal_flow()?;
return Ok(g); Ok(g)
} }
fn minimize_rebalance_load(&self, gflow: &mut Graph<FlowEdge>, zone_to_id: &HashMap<String, usize>, old_assoc : &Vec< Vec<usize> >) -> Result<(), Error > { fn minimize_rebalance_load(&self, gflow: &mut Graph<FlowEdge>, zone_to_id: &HashMap<String, usize>, old_assoc : &[Vec<usize> ]) -> Result<(), Error > {
let mut cost = CostFunction::new(); let mut cost = CostFunction::new();
for p in 0..NB_PARTITIONS { for (p, assoc_p) in old_assoc.iter().enumerate(){
for n in old_assoc[p].iter() { for n in assoc_p.iter() {
let node_zone = zone_to_id[&self.get_node_zone(&self.node_id_vec[*n])?]; let node_zone = zone_to_id[&self.get_node_zone(&self.node_id_vec[*n])?];
cost.insert((Vertex::PZ(p,node_zone), Vertex::N(*n)), -1); cost.insert((Vertex::PZ(p,node_zone), Vertex::N(*n)), -1);
} }
@ -653,7 +649,7 @@ impl ClusterLayout {
let path_length = 4*nb_nodes; let path_length = 4*nb_nodes;
gflow.optimize_flow_with_cost(&cost, path_length)?; gflow.optimize_flow_with_cost(&cost, path_length)?;
return Ok(()); Ok(())
} }
fn update_ring_from_flow(&mut self, nb_zones : usize, gflow: &Graph<FlowEdge> ) -> Result<(), Error>{ fn update_ring_from_flow(&mut self, nb_zones : usize, gflow: &Graph<FlowEdge> ) -> Result<(), Error>{
@ -662,9 +658,8 @@ impl ClusterLayout {
for z in 0..nb_zones { for z in 0..nb_zones {
let assoc_vertex = gflow.get_positive_flow_from(Vertex::PZ(p,z))?; let assoc_vertex = gflow.get_positive_flow_from(Vertex::PZ(p,z))?;
for vertex in assoc_vertex.iter() { for vertex in assoc_vertex.iter() {
match vertex{ if let Vertex::N(n) = vertex {
Vertex::N(n) => self.ring_assignation_data.push((*n).try_into().unwrap()), self.ring_assignation_data.push((*n).try_into().unwrap());
_ => ()
} }
} }
} }
@ -674,7 +669,7 @@ impl ClusterLayout {
return Err(Error::Message("Critical Error : the association ring we produced does not \ return Err(Error::Message("Critical Error : the association ring we produced does not \
have the right size.".into())); have the right size.".into()));
} }
return Ok(()); Ok(())
} }
@ -683,7 +678,7 @@ impl ClusterLayout {
fn output_stat(&self , gflow : &Graph<FlowEdge>, fn output_stat(&self , gflow : &Graph<FlowEdge>,
old_assoc_opt : &Option< Vec<Vec<usize>> >, old_assoc_opt : &Option< Vec<Vec<usize>> >,
zone_to_id: &HashMap<String, usize>, zone_to_id: &HashMap<String, usize>,
id_to_zone : &Vec<String>) -> Result<Message, Error>{ id_to_zone : &[String]) -> Result<Message, Error>{
let mut msg = Message::new(); let mut msg = Message::new();
let nb_partitions = 1usize << PARTITION_BITS; let nb_partitions = 1usize << PARTITION_BITS;
@ -693,12 +688,12 @@ impl ClusterLayout {
let percent_cap = 100.0*(used_cap as f32)/(total_cap as f32); let percent_cap = 100.0*(used_cap as f32)/(total_cap as f32);
msg.push(format!("Available capacity / Total cluster capacity: {} / {} ({:.1} %)", msg.push(format!("Available capacity / Total cluster capacity: {} / {} ({:.1} %)",
used_cap , total_cap , percent_cap )); used_cap , total_cap , percent_cap ));
msg.push(format!("")); msg.push("".into());
msg.push(format!("If the percentage is to low, it might be that the \ msg.push("If the percentage is to low, it might be that the \
replication/redundancy constraints force the use of nodes/zones with small \ replication/redundancy constraints force the use of nodes/zones with small \
storage capacities. \ storage capacities. \
You might want to rebalance the storage capacities or relax the constraints. \ You might want to rebalance the storage capacities or relax the constraints. \
See the detailed statistics below and look for saturated nodes/zones.")); See the detailed statistics below and look for saturated nodes/zones.".into());
msg.push(format!("Recall that because of the replication factor, the actual available \ msg.push(format!("Recall that because of the replication factor, the actual available \
storage capacity is {} / {} = {}.", storage capacity is {} / {} = {}.",
used_cap , self.replication_factor , used_cap , self.replication_factor ,
@ -715,7 +710,7 @@ impl ClusterLayout {
for p in 0..nb_partitions { for p in 0..nb_partitions {
for z in 0..id_to_zone.len() { for z in 0..id_to_zone.len() {
let pz_nodes = gflow.get_positive_flow_from(Vertex::PZ(p,z))?; let pz_nodes = gflow.get_positive_flow_from(Vertex::PZ(p,z))?;
if pz_nodes.len() > 0 { if !pz_nodes.is_empty() {
stored_partitions_zone[z] += 1; stored_partitions_zone[z] += 1;
if let Some(old_assoc) = old_assoc_opt { if let Some(old_assoc) = old_assoc_opt {
let mut old_zones_of_p = Vec::<usize>::new(); let mut old_zones_of_p = Vec::<usize>::new();
@ -748,14 +743,14 @@ impl ClusterLayout {
//We display the statistics //We display the statistics
msg.push(format!("")); msg.push("".into());
if *old_assoc_opt != None { if *old_assoc_opt != None {
let total_new_partitions : usize = new_partitions.iter().sum(); let total_new_partitions : usize = new_partitions.iter().sum();
msg.push(format!("A total of {} new copies of partitions need to be \ msg.push(format!("A total of {} new copies of partitions need to be \
transferred.", total_new_partitions)); transferred.", total_new_partitions));
} }
msg.push(format!("")); msg.push("".into());
msg.push(format!("==== DETAILED STATISTICS BY ZONES AND NODES ====")); msg.push("==== DETAILED STATISTICS BY ZONES AND NODES ====".into());
for z in 0..id_to_zone.len(){ for z in 0..id_to_zone.len(){
let mut nodes_of_z = Vec::<usize>::new(); let mut nodes_of_z = Vec::<usize>::new();
@ -766,7 +761,7 @@ impl ClusterLayout {
} }
let replicated_partitions : usize = nodes_of_z.iter() let replicated_partitions : usize = nodes_of_z.iter()
.map(|n| stored_partitions[*n]).sum(); .map(|n| stored_partitions[*n]).sum();
msg.push(format!("")); msg.push("".into());
msg.push(format!("Zone {}: {} distinct partitions stored ({} new, \ msg.push(format!("Zone {}: {} distinct partitions stored ({} new, \
{} partition copies) ", id_to_zone[z], stored_partitions_zone[z], {} partition copies) ", id_to_zone[z], stored_partitions_zone[z],
@ -796,7 +791,7 @@ impl ClusterLayout {
} }
} }
return Ok(msg); Ok(msg)
} }
} }