diff options
author | Alex Auvolat <alex@adnab.me> | 2021-11-09 12:24:04 +0100 |
---|---|---|
committer | Alex Auvolat <alex@adnab.me> | 2021-11-16 16:05:53 +0100 |
commit | c94406f4282d48e2e2ac82ffb57eafaad23f7edc (patch) | |
tree | 01fe1b272e18fdae993e2207d8d3aea4a301ec56 /src/rpc/rpc_helper.rs | |
parent | 53888995bdd7c672d2e3ab8bb6a3529195c127a9 (diff) | |
download | garage-0.5-beta1.tar.gz garage-0.5-beta1.zip |
Improve how node roles are assigned in Garagev0.5-beta1
- change the terminology: the network configuration becomes the role
table, the configuration of a nodes becomes a node's role
- the modification of the role table takes place in two steps: first,
changes are staged in a CRDT data structure. Then, once the user is
happy with the changes, they can commit them all at once (or revert
them).
- update documentation
- fix tests
- implement smarter partition assignation algorithm
This patch breaks the format of the network configuration: when
migrating, the cluster will be in a state where no roles are assigned.
All roles must be re-assigned and commited at once. This migration
should not pose an issue.
Diffstat (limited to 'src/rpc/rpc_helper.rs')
-rw-r--r-- | src/rpc/rpc_helper.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rpc/rpc_helper.rs b/src/rpc/rpc_helper.rs index df0e94f8..68bdfc4f 100644 --- a/src/rpc/rpc_helper.rs +++ b/src/rpc/rpc_helper.rs @@ -225,7 +225,7 @@ impl RpcHelper { // Retrieve some status variables that we will use to sort requests let peer_list = self.0.fullmesh.get_peer_list(); let ring: Arc<Ring> = self.0.ring.borrow().clone(); - let our_zone = match ring.config.members.get(&self.0.our_node_id) { + let our_zone = match ring.layout.node_role(&self.0.our_node_id) { Some(pc) => &pc.zone, None => "", }; @@ -238,7 +238,7 @@ impl RpcHelper { // and within a same zone we priorize nodes with the lowest latency. let mut requests = requests .map(|(to, fut)| { - let peer_zone = match ring.config.members.get(&to) { + let peer_zone = match ring.layout.node_role(&to) { Some(pc) => &pc.zone, None => "", }; |