aboutsummaryrefslogtreecommitdiff
path: root/src/rpc
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-09-07 11:59:56 +0200
committerAlex Auvolat <alex@adnab.me>2022-09-07 11:59:56 +0200
commitdb61f41030678c5756c844c8aa41a210c658769e (patch)
tree492bff626d37cbcdfb2a65ee2580a1cc60c13125 /src/rpc
parent6f02c36a89d93b04944a3f0882b6f6b703d9c012 (diff)
downloadgarage-db61f41030678c5756c844c8aa41a210c658769e.tar.gz
garage-db61f41030678c5756c844c8aa41a210c658769e.zip
Move GIT_VERSION injection later in build chain to reduce build times
Diffstat (limited to 'src/rpc')
-rw-r--r--src/rpc/system.rs11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/rpc/system.rs b/src/rpc/system.rs
index fbfbbf56..d621f59f 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 PING_TIMEOUT: Duration = Duration::from_secs(2);
-/// 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