filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed S3 backoff bug

Browse Source
This commit is contained in:
mdecimus
2025-01-16 18:58:02 +01:00
parent bfba299e6b
commit 4901411900
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/common/src/config/smtp/queue.rs
View File

@@ -390,10 +390,12 @@ fn parse_queue_throttle(config: &mut Config) -> QueueThrottle {
host: Vec::new(),
outbound_concurrency: config
.property_or_default::<usize>("queue.threads.remote", "25")
.unwrap_or(25),
.unwrap_or(25)
.max(1),
local_concurrency: config
.property_or_default::<usize>("queue.threads.local", "10")
.unwrap_or(10),
.unwrap_or(10)
.max(1),
};
let all_throttles = parse_throttle(

6
crates/store/src/backend/s3/mod.rs
View File

@@ -100,7 +100,7 @@ impl S3Store {
500..=599 if retries_left > 0 => {
// wait backoff
tokio::time::sleep(Duration::from_secs(
1 << (self.max_retries - retries_left).max(6),
1 << (self.max_retries - retries_left).min(6),
))
.await;
@@ -130,7 +130,7 @@ impl S3Store {
500..=599 if retries_left > 0 => {
// wait backoff
tokio::time::sleep(Duration::from_secs(
1 << (self.max_retries - retries_left).max(6),
1 << (self.max_retries - retries_left).min(6),
))
.await;
@@ -161,7 +161,7 @@ impl S3Store {
500..=599 if retries_left > 0 => {
// wait backoff
tokio::time::sleep(Duration::from_secs(
1 << (self.max_retries - retries_left).max(6),
1 << (self.max_retries - retries_left).min(6),
))
.await;