diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-09-08 15:50:56 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-09-08 15:50:56 +0200 |
| commit | 7f54706b95beb033820924e77e18f21f241d223e (patch) | |
| tree | 26fc26ebb80e15a1ca64edd03efc9fac758274d0 /src/rpc/system.rs | |
| parent | 907054775dc71a10a92ab96112889db9113130ab (diff) | |
| parent | d9d199a6c9c0ae2a6ee2b04103c78ef1eb311956 (diff) | |
| download | garage-7f54706b95beb033820924e77e18f21f241d223e.tar.gz garage-7f54706b95beb033820924e77e18f21f241d223e.zip | |
Merge branch 'lx-perf-improvements' into netapp-stream-body
Diffstat (limited to 'src/rpc/system.rs')
| -rw-r--r-- | src/rpc/system.rs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/rpc/system.rs b/src/rpc/system.rs index d7ef2140..c0e70c61 100644 --- a/src/rpc/system.rs +++ b/src/rpc/system.rs @@ -27,7 +27,6 @@ use garage_util::data::*; use garage_util::error::*; use garage_util::persister::Persister; use garage_util::time::*; -use garage_util::version; use crate::consul::*; #[cfg(feature = "kubernetes-discovery")] @@ -40,8 +39,10 @@ const DISCOVERY_INTERVAL: Duration = Duration::from_secs(60); const STATUS_EXCHANGE_INTERVAL: Duration = Duration::from_secs(10); const SYSTEM_RPC_TIMEOUT: Duration = Duration::from_secs(15); -/// Version tag used for version check upon Netapp connection -pub const GARAGE_VERSION_TAG: u64 = 0x6761726167650007; // garage 0x0007 +/// Version tag used for version check upon Netapp connection. +/// Cluster nodes with different version tags are deemed +/// incompatible and will refuse to connect. +pub const GARAGE_VERSION_TAG: u64 = 0x6761726167650008; // garage 0x0008 /// RPC endpoint used for calls related to membership pub const SYSTEM_RPC_PATH: &str = "garage_rpc/membership.rs/SystemRpc"; @@ -320,10 +321,6 @@ impl System { // ---- Administrative operations (directly available and // also available through RPC) ---- - pub fn garage_version(&self) -> &'static str { - version::garage() - } - pub fn get_known_nodes(&self) -> Vec<KnownNodeInfo> { let node_status = self.node_status.read().unwrap(); let known_nodes = self |