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/table | |
parent | f3bf34b6a18c547c5fb29346787648048c093d52 (diff) | |
download | garage-df094bd8075332bb765b8b44c9b19cf2485e9ca8.tar.gz garage-df094bd8075332bb765b8b44c9b19cf2485e9ca8.zip |
Less strict timeouts
Diffstat (limited to 'src/table')
-rw-r--r-- | src/table/gc.rs | 3 | ||||
-rw-r--r-- | src/table/sync.rs | 3 | ||||
-rw-r--r-- | src/table/table.rs | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/table/gc.rs b/src/table/gc.rs index 12218d97..6cae9701 100644 --- a/src/table/gc.rs +++ b/src/table/gc.rs @@ -25,7 +25,8 @@ use crate::replication::*; use crate::schema::*; const TABLE_GC_BATCH_SIZE: usize = 1024; -const TABLE_GC_RPC_TIMEOUT: Duration = Duration::from_secs(30); +// Same timeout as NEED_BLOCK_QUERY_TIMEOUT in block manager +const TABLE_GC_RPC_TIMEOUT: Duration = Duration::from_secs(15); // GC delay for table entries: 1 day (24 hours) // (the delay before the entry is added in the GC todo list diff --git a/src/table/sync.rs b/src/table/sync.rs index b3756a5e..62b88a58 100644 --- a/src/table/sync.rs +++ b/src/table/sync.rs @@ -24,7 +24,8 @@ use crate::merkle::*; use crate::replication::*; use crate::*; -const TABLE_SYNC_RPC_TIMEOUT: Duration = Duration::from_secs(30); +// Sync RPC can contain a lot of data, so have a 1min timeout +const TABLE_SYNC_RPC_TIMEOUT: Duration = Duration::from_secs(60); // Do anti-entropy every 10 minutes const ANTI_ENTROPY_INTERVAL: Duration = Duration::from_secs(10 * 60); diff --git a/src/table/table.rs b/src/table/table.rs index 3c211728..51f3837f 100644 --- a/src/table/table.rs +++ b/src/table/table.rs @@ -31,7 +31,7 @@ use crate::schema::*; use crate::sync::*; use crate::util::*; -pub const TABLE_RPC_TIMEOUT: Duration = Duration::from_secs(10); +pub const TABLE_RPC_TIMEOUT: Duration = Duration::from_secs(30); pub struct Table<F: TableSchema + 'static, R: TableReplication + 'static> { pub system: Arc<System>, |