diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-01-04 11:34:43 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-01-04 11:34:43 +0100 |
| commit | 570e5e5bbb7a3eac41350db9433e28ed289b97f4 (patch) | |
| tree | a7fc299ba180098be5a3bef28a39256870ce697b /src/rpc/layout.rs | |
| parent | 6e44369cbc810b8912ca0f7f5fd293e87f10c851 (diff) | |
| parent | 4eb8ca3a528dae2848141f5cc3eb607eb7d40114 (diff) | |
| download | garage-570e5e5bbb7a3eac41350db9433e28ed289b97f4.tar.gz garage-570e5e5bbb7a3eac41350db9433e28ed289b97f4.zip | |
Merge branch 'main' into next
Diffstat (limited to 'src/rpc/layout.rs')
| -rw-r--r-- | src/rpc/layout.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/rpc/layout.rs b/src/rpc/layout.rs index 1cef44d1..d756f0aa 100644 --- a/src/rpc/layout.rs +++ b/src/rpc/layout.rs @@ -9,6 +9,7 @@ use serde::{Deserialize, Serialize}; use garage_util::crdt::{AutoCrdt, Crdt, Lww, LwwMap}; use garage_util::data::*; +use garage_util::encode::nonversioned_encode; use garage_util::error::*; use crate::graph_algo::*; @@ -58,6 +59,7 @@ pub struct ClusterLayout { pub staging_roles: LwwMap<Uuid, NodeRoleV>, pub staging_hash: Hash, } +impl garage_util::migrate::InitialFormat for ClusterLayout {} /// This struct is used to set the parameters to be used in the assignation computation /// algorithm. It is stored as a Crdt. @@ -134,7 +136,7 @@ impl ClusterLayout { fn calculate_staging_hash(&self) -> Hash { let hashed_tuple = (&self.staging_roles, &self.staging_parameters); - blake2sum(&rmp_to_vec_all_named(&hashed_tuple).unwrap()[..]) + blake2sum(&nonversioned_encode(&hashed_tuple).unwrap()[..]) } pub fn merge(&mut self, other: &ClusterLayout) -> bool { |