Merge load limiting and rebalancing changes from deleuze

diff --git a/conf.d/main/02_exim4-config_options b/conf.d/main/02_exim4-config_options
index 38ee0e8..c5e3005 100644 (file)
--- a/conf.d/main/02_exim4-config_options
+++ b/conf.d/main/02_exim4-config_options
@@ -199,12 +199,15 @@ trusted_groups = MAIN_TRUSTED_GROUPS
 # MAIN_SMTP_BANNER = "${primary_hostname} ESMTP Exim ${version_number} (Debian package MAIN_PACKAGE_VERSION) ${tod_full}"
 # smtp_banner = $smtp_active_hostname ESMTP Exim $version_number $tod_full
 
 # MAIN_SMTP_BANNER = "${primary_hostname} ESMTP Exim ${version_number} (Debian package MAIN_PACKAGE_VERSION) ${tod_full}"
 # smtp_banner = $smtp_active_hostname ESMTP Exim $version_number $tod_full
 

+# load management (hcoop-change)
+smtp_accept_max = 50
+retry_data_expire = 1d 
+retry_interval_max = 4h
+# load max is an initial estimate... 6*NR_CPUS seems reasonable (clinton)
+queue_only_load = 12
+deliver_queue_load_max = 36
+# doubling the queue runner count doesn't seem to negatively impact
+# performance. This may be uneccessary (clinton)
+queue_run_max = 10

 
 

-# hcoop-change: raise limit for incoming SMTP connections
-smtp_accept_max = 95
-
-# hcoop-change: expire retry data after a single day
-retry_data_expire = 1d

 
 

-# hcoop-change: don't penalize hosts past 4 hours
-retry_interval_max = 4h