Increased concurrency for local message delivery

This commit is contained in:
mdecimus
2025-01-16 18:52:46 +01:00
parent ef721412da
commit bfba299e6b
8 changed files with 56 additions and 19 deletions

View File

@@ -84,7 +84,8 @@ pub struct QueueOutboundTimeout {
#[derive(Debug, Clone)]
pub struct QueueThrottle {
pub outbound_concurrency: u64,
pub outbound_concurrency: usize,
pub local_concurrency: usize,
pub sender: Vec<Throttle>,
pub rcpt: Vec<Throttle>,
pub host: Vec<Throttle>,
@@ -203,6 +204,7 @@ impl Default for QueueConfig {
},
throttle: QueueThrottle {
outbound_concurrency: 25,
local_concurrency: 10,
sender: Default::default(),
rcpt: Default::default(),
host: Default::default(),
@@ -387,8 +389,11 @@ fn parse_queue_throttle(config: &mut Config) -> QueueThrottle {
rcpt: Vec::new(),
host: Vec::new(),
outbound_concurrency: config
.property_or_default::<u64>("queue.outbound.concurrency", "25")
.property_or_default::<usize>("queue.threads.remote", "25")
.unwrap_or(25),
local_concurrency: config
.property_or_default::<usize>("queue.threads.local", "10")
.unwrap_or(10),
};
let all_throttles = parse_throttle(

View File

@@ -59,7 +59,7 @@ impl Server {
match self.order(provider).await {
Ok(pem) => return self.process_cert(provider, pem, false).await,
Err(err)
if !err.matches(EventType::Acme(AcmeEvent::OrderInvalid)) && backoff < 16 =>
if !err.matches(EventType::Acme(AcmeEvent::OrderInvalid)) && backoff < 9 =>
{
trc::event!(
Acme(AcmeEvent::RenewBackoff),