diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-09-01 16:30:44 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-09-01 16:30:44 +0200 |
| commit | df094bd8075332bb765b8b44c9b19cf2485e9ca8 (patch) | |
| tree | 3cc838ad263c10960903b8b865e356d14eef9f60 /src/rpc | |
| parent | f3bf34b6a18c547c5fb29346787648048c093d52 (diff) | |
| download | garage-df094bd8075332bb765b8b44c9b19cf2485e9ca8.tar.gz garage-df094bd8075332bb765b8b44c9b19cf2485e9ca8.zip | |
Less strict timeouts
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/rpc_helper.rs | 2 | ||||
| -rw-r--r-- | src/rpc/system.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/rpc/rpc_helper.rs b/src/rpc/rpc_helper.rs index 6c79c502..e9575261 100644 --- a/src/rpc/rpc_helper.rs +++ b/src/rpc/rpc_helper.rs @@ -31,7 +31,7 @@ use garage_util::metrics::RecordDuration; use crate::metrics::RpcMetrics; use crate::ring::Ring; -const DEFAULT_TIMEOUT: Duration = Duration::from_secs(10); +const DEFAULT_TIMEOUT: Duration = Duration::from_secs(30); // Don't allow more than 100 concurrent outgoing RPCs. const MAX_CONCURRENT_REQUESTS: usize = 100; diff --git a/src/rpc/system.rs b/src/rpc/system.rs index 5858660e..d7ef2140 100644 --- a/src/rpc/system.rs +++ b/src/rpc/system.rs @@ -38,7 +38,7 @@ use crate::rpc_helper::*; 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); +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 @@ -561,7 +561,7 @@ impl System { .broadcast( &self.system_endpoint, SystemRpc::AdvertiseStatus(local_status), - RequestStrategy::with_priority(PRIO_HIGH).with_timeout(PING_TIMEOUT), + RequestStrategy::with_priority(PRIO_HIGH).with_timeout(SYSTEM_RPC_TIMEOUT), ) .await; @@ -685,7 +685,7 @@ impl System { &self.system_endpoint, peer, SystemRpc::PullClusterLayout, - RequestStrategy::with_priority(PRIO_HIGH).with_timeout(PING_TIMEOUT), + RequestStrategy::with_priority(PRIO_HIGH).with_timeout(SYSTEM_RPC_TIMEOUT), ) .await; if let Ok(SystemRpc::AdvertiseClusterLayout(layout)) = resp { |