diff options
| author | Alex <alex@adnab.me> | 2024-01-16 13:33:43 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2024-01-16 13:33:43 +0000 |
| commit | 9cfeea389a1274d4d3c1f4b7072b0c056af410ef (patch) | |
| tree | d2e1b706c14f3c3461218cc659cd5c59d201bea8 /src/rpc | |
| parent | 707d85f60293099e75e5aa821c0ee66796fdaa5b (diff) | |
| parent | 82a29bf6e5bf3f0d616b3214db02eb063d7a15b4 (diff) | |
| download | garage-9cfeea389a1274d4d3c1f4b7072b0c056af410ef.tar.gz garage-9cfeea389a1274d4d3c1f4b7072b0c056af410ef.zip | |
Merge pull request 'CLI help, comments & messages: make clear that full-length node ID = public key' (#688) from rename-public-key into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/688
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/consul.rs | 2 | ||||
| -rw-r--r-- | src/rpc/system.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rpc/consul.rs b/src/rpc/consul.rs index ab8d1112..71fd71b0 100644 --- a/src/rpc/consul.rs +++ b/src/rpc/consul.rs @@ -148,7 +148,7 @@ impl ConsulDiscovery { ret.push((pubkey, SocketAddr::new(ip, ent.service_port))); } else { warn!( - "Could not process node spec from Consul: {:?} (invalid IP or public key)", + "Could not process node spec from Consul: {:?} (invalid IP address or node ID/pubkey)", ent ); } diff --git a/src/rpc/system.rs b/src/rpc/system.rs index 4b40bec4..4cec369b 100644 --- a/src/rpc/system.rs +++ b/src/rpc/system.rs @@ -57,7 +57,7 @@ pub const SYSTEM_RPC_PATH: &str = "garage_rpc/membership.rs/SystemRpc"; pub enum SystemRpc { /// Response to successfull advertisements Ok, - /// Request to connect to a specific node (in <pubkey>@<host>:<port> format) + /// Request to connect to a specific node (in <pubkey>@<host>:<port> format, pubkey = full-length node ID) Connect(String), /// Ask other node its cluster layout. Answered with AdvertiseClusterLayout PullClusterLayout, |