aboutsummaryrefslogtreecommitdiff
path: root/src/rpc/ring.rs
diff options
context:
space:
mode:
authorAlex <alex@adnab.me>2023-01-11 16:05:27 +0000
committerAlex <alex@adnab.me>2023-01-11 16:05:27 +0000
commit4f409f73dc160a09b350cd830ab121ae8e994347 (patch)
tree94ad886dacb0dbbd6394b05d37f79763e5c02bea /src/rpc/ring.rs
parent80e4abb98dfbf2e88414a8b28e8c9134fa0a65e7 (diff)
parentcb07e6145cf26a9bbbe44fd06090a099030d0750 (diff)
downloadgarage-4f409f73dc160a09b350cd830ab121ae8e994347.tar.gz
garage-4f409f73dc160a09b350cd830ab121ae8e994347.zip
Merge pull request 'Changed all instances of assignation to assignment' (#465) from jpds/garage:assignments-correction into next
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/465
Diffstat (limited to 'src/rpc/ring.rs')
-rw-r--r--src/rpc/ring.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rpc/ring.rs b/src/rpc/ring.rs
index 743a5cba..6a2e5c72 100644
--- a/src/rpc/ring.rs
+++ b/src/rpc/ring.rs
@@ -63,12 +63,12 @@ struct RingEntry {
impl Ring {
pub(crate) fn new(layout: ClusterLayout, replication_factor: usize) -> Self {
if replication_factor != layout.replication_factor {
- warn!("Could not build ring: replication factor does not match between local configuration and network role assignation.");
+ warn!("Could not build ring: replication factor does not match between local configuration and network role assignment.");
return Self::empty(layout, replication_factor);
}
- if layout.ring_assignation_data.len() != replication_factor * (1 << PARTITION_BITS) {
- warn!("Could not build ring: network role assignation data has invalid length");
+ if layout.ring_assignment_data.len() != replication_factor * (1 << PARTITION_BITS) {
+ warn!("Could not build ring: network role assignment data has invalid length");
return Self::empty(layout, replication_factor);
}
@@ -78,7 +78,7 @@ impl Ring {
let top = (i as u16) << (16 - PARTITION_BITS);
let mut nodes_buf = [0u8; MAX_REPLICATION];
nodes_buf[..replication_factor].copy_from_slice(
- &layout.ring_assignation_data
+ &layout.ring_assignment_data
[replication_factor * i..replication_factor * (i + 1)],
);
RingEntry {