Deuxfleurs/garage
48
56
Fork 73
Code Issues 100 Pull requests 13 Releases 30 Wiki Activity

New layout: fixes and UX improvements #634

Merged
lx merged 10 commits from new-layout-ux into next 2023-09-27 09:04:32 +00:00
Conversation 0 Commits 10 Files changed 9 +6 -2
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 3ecc17f8c5 - Show all commits

8
src/rpc/graph_algo.rs
View file

@ -1,7 +1,7 @@
//! This module deals with graph algorithms. //! This module deals with graph algorithms.
//! It is used in layout.rs to build the partition to node assignment. //! It is used in layout.rs to build the partition to node assignment.
use rand::prelude::SliceRandom; use rand::prelude::{SeedableRng, SliceRandom};
use std::cmp::{max, min}; use std::cmp::{max, min};
use std::collections::HashMap; use std::collections::HashMap;
use std::collections::VecDeque; use std::collections::VecDeque;
@ -143,7 +143,11 @@ impl Graph<FlowEdge> {
/// 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
/// reversed edges consistent. /// reversed edges consistent.
fn shuffle_edges(&mut self) { fn shuffle_edges(&mut self) {
let mut rng = rand::thread_rng(); // We use deterministic randomness so that the layout calculation algorihtm
// will output the same thing every time it is run. This way, the results
// pre-calculated in `garage layout show` will match exactly those used
// in practice with `garage layout apply`
let mut rng = rand::rngs::StdRng::from_seed([0x12u8; 32]);
for i in 0..self.graph.len() { for i in 0..self.graph.len() {
self.graph[i].shuffle(&mut rng); self.graph[i].shuffle(&mut rng);
// We need to update the ids of the reverse edges. // We need to update the ids of the reverse edges.