From: Tom Hughes Date: Wed, 12 Oct 2016 07:32:51 +0000 (+0100) Subject: Rename MaxClients to MaxRequestWorkers X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/3f0adbf98daf65d842dc28bf372fba289f6c74ec Rename MaxClients to MaxRequestWorkers --- diff --git a/cookbooks/apache/attributes/default.rb b/cookbooks/apache/attributes/default.rb index 37b87aaf3..25322ca1b 100644 --- a/cookbooks/apache/attributes/default.rb +++ b/cookbooks/apache/attributes/default.rb @@ -7,7 +7,7 @@ default[:apache][:keepalive] = true default[:apache][:prefork][:start_servers] = 5 default[:apache][:prefork][:min_spare_servers] = 5 default[:apache][:prefork][:max_spare_servers] = 10 -default[:apache][:prefork][:max_clients] = 150 +default[:apache][:prefork][:max_request_workers] = 150 default[:apache][:prefork][:max_requests_per_child] = 0 default[:apache][:worker][:start_servers] = 2 @@ -15,11 +15,11 @@ default[:apache][:worker][:min_spare_threads] = 25 default[:apache][:worker][:max_spare_threads] = 75 default[:apache][:worker][:thread_limit] = 64 default[:apache][:worker][:threads_per_child] = 25 -default[:apache][:worker][:max_clients] = 150 +default[:apache][:worker][:max_request_workers] = 150 default[:apache][:worker][:max_requests_per_child] = 0 default[:apache][:event][:start_servers] = 2 -default[:apache][:event][:max_clients] = 150 +default[:apache][:event][:max_request_workers] = 150 default[:apache][:event][:min_spare_threads] = 25 default[:apache][:event][:max_spare_threads] = 75 default[:apache][:event][:thread_limit] = 64 diff --git a/cookbooks/apache/templates/default/httpd.conf.erb b/cookbooks/apache/templates/default/httpd.conf.erb index f2060f45e..f181ba7cf 100644 --- a/cookbooks/apache/templates/default/httpd.conf.erb +++ b/cookbooks/apache/templates/default/httpd.conf.erb @@ -14,7 +14,7 @@ ServerLimit <%= node[:apache][:prefork][:server_limit] %> <% end -%> MinSpareServers <%= node[:apache][:prefork][:min_spare_servers] %> MaxSpareServers <%= node[:apache][:prefork][:max_spare_servers] %> -MaxClients <%= node[:apache][:prefork][:max_clients] %> +MaxRequestWorkers <%= node[:apache][:prefork][:max_request_workers] %> MaxRequestsPerChild <%= node[:apache][:prefork][:max_requests_per_child] %> <% end -%> <% if node[:apache][:mpm] == "worker" -%> @@ -28,7 +28,7 @@ MinSpareThreads <%= node[:apache][:worker][:min_spare_threads] %> MaxSpareThreads <%= node[:apache][:worker][:max_spare_threads] %> ThreadLimit <%= node[:apache][:worker][:thread_limit] %> ThreadsPerChild <%= node[:apache][:worker][:threads_per_child] %> -MaxClients <%= node[:apache][:worker][:max_clients] %> +MaxRequestWorkers <%= node[:apache][:worker][:max_request_workers] %> MaxRequestsPerChild <%= node[:apache][:worker][:max_requests_per_child] %> <% end -%> <% if node[:apache][:mpm] == "event" -%> @@ -42,7 +42,7 @@ MinSpareThreads <%= node[:apache][:event][:min_spare_threads] %> MaxSpareThreads <%= node[:apache][:event][:max_spare_threads] %> ThreadLimit <%= node[:apache][:event][:thread_limit] %> ThreadsPerChild <%= node[:apache][:event][:threads_per_child] %> -MaxClients <%= node[:apache][:event][:max_clients] %> +MaxRequestWorkers <%= node[:apache][:event][:max_request_workers] %> MaxRequestsPerChild <%= node[:apache][:event][:max_requests_per_child] %> <% end -%> diff --git a/roles/dev.rb b/roles/dev.rb index 07dfdd940..9522ed62f 100644 --- a/roles/dev.rb +++ b/roles/dev.rb @@ -90,7 +90,7 @@ default_attributes( :timeout => 30, :event => { :server_limit => 32, - :max_clients => 800, + :max_request_workers => 800, :threads_per_child => 50, :max_requests_per_child => 10000 } diff --git a/roles/forum.rb b/roles/forum.rb index c032d6b70..e9a38146a 100644 --- a/roles/forum.rb +++ b/roles/forum.rb @@ -21,7 +21,7 @@ default_attributes( :start_servers => 20, :min_spare_servers => 20, :max_spare_servers => 50, - :max_clients => 256 + :max_request_workers => 256 } } ) diff --git a/roles/nominatim.rb b/roles/nominatim.rb index 6e2a75ce4..4a7d40e06 100644 --- a/roles/nominatim.rb +++ b/roles/nominatim.rb @@ -18,7 +18,7 @@ default_attributes( :keepalive => false, :event => { :server_limit => 32, - :max_clients => 1600, + :max_request_workers => 1600, :threads_per_child => 50 } }, diff --git a/roles/planet.rb b/roles/planet.rb index d9f0112bb..9d79d8e25 100644 --- a/roles/planet.rb +++ b/roles/planet.rb @@ -41,7 +41,7 @@ default_attributes( :keepalive => true, :event => { :server_limit => 20, - :max_clients => 1000, + :max_request_workers => 1000, :threads_per_child => 50, :max_spare_threads => 525 } diff --git a/roles/taginfo.rb b/roles/taginfo.rb index 4b0fb23bd..a0a3f9787 100644 --- a/roles/taginfo.rb +++ b/roles/taginfo.rb @@ -17,7 +17,7 @@ default_attributes( :mpm => "event", :event => { :server_limit => 40, - :max_clients => 1000, + :max_request_workers => 1000, :min_spare_threads => 50, :max_spare_threads => 150, :threads_per_child => 50, diff --git a/roles/tile.rb b/roles/tile.rb index 0944b768e..a126bc169 100644 --- a/roles/tile.rb +++ b/roles/tile.rb @@ -15,7 +15,7 @@ default_attributes( :timeout => 60, :event => { :server_limit => 60, - :max_clients => 1200, + :max_request_workers => 1200, :threads_per_child => 20, :min_spare_threads => 30, :max_spare_threads => 180, diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb index 971a51b37..646735bf2 100644 --- a/roles/web-frontend.rb +++ b/roles/web-frontend.rb @@ -6,7 +6,7 @@ default_attributes( :mpm => "event", :event => { :server_limit => 40, - :max_clients => 1000, + :max_request_workers => 1000, :min_spare_threads => 50, :max_spare_threads => 150, :threads_per_child => 50, diff --git a/roles/wiki.rb b/roles/wiki.rb index e6d4564e7..1ce53771f 100644 --- a/roles/wiki.rb +++ b/roles/wiki.rb @@ -39,7 +39,7 @@ default_attributes( :timeout => 30, :event => { :server_limit => 32, - :max_clients => 800, + :max_request_workers => 800, :threads_per_child => 50, :max_requests_per_child => 10000 } diff --git a/roles/yournavigation.rb b/roles/yournavigation.rb index af79bde1d..65334df85 100644 --- a/roles/yournavigation.rb +++ b/roles/yournavigation.rb @@ -15,7 +15,7 @@ default_attributes( :start_servers => 20, :min_spare_servers => 20, :max_spare_servers => 50, - :max_clients => 256 + :max_request_workers => 256 } } )