From 7013f21316fbdc86a8a36c7aea7f908878db6ef7 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 12 Oct 2016 08:36:59 +0100 Subject: [PATCH] Rename MaxRequestsPerChild to MaxConnectionsPerChild --- cookbooks/apache/attributes/default.rb | 8 ++++---- cookbooks/apache/templates/default/httpd.conf.erb | 6 +++--- roles/dev.rb | 2 +- roles/shenron.rb | 2 +- roles/taginfo.rb | 2 +- roles/tile.rb | 2 +- roles/web-backend.rb | 2 +- roles/web-frontend.rb | 2 +- roles/wiki.rb | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cookbooks/apache/attributes/default.rb b/cookbooks/apache/attributes/default.rb index 25322ca1b..ee69042c7 100644 --- a/cookbooks/apache/attributes/default.rb +++ b/cookbooks/apache/attributes/default.rb @@ -8,7 +8,7 @@ default[:apache][:prefork][:start_servers] = 5 default[:apache][:prefork][:min_spare_servers] = 5 default[:apache][:prefork][:max_spare_servers] = 10 default[:apache][:prefork][:max_request_workers] = 150 -default[:apache][:prefork][:max_requests_per_child] = 0 +default[:apache][:prefork][:max_connections_per_child] = 0 default[:apache][:worker][:start_servers] = 2 default[:apache][:worker][:min_spare_threads] = 25 @@ -16,15 +16,15 @@ default[:apache][:worker][:max_spare_threads] = 75 default[:apache][:worker][:thread_limit] = 64 default[:apache][:worker][:threads_per_child] = 25 default[:apache][:worker][:max_request_workers] = 150 -default[:apache][:worker][:max_requests_per_child] = 0 +default[:apache][:worker][:max_connections_per_child] = 0 default[:apache][:event][:start_servers] = 2 -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 default[:apache][:event][:threads_per_child] = 25 -default[:apache][:event][:max_requests_per_child] = 0 +default[:apache][:event][:max_request_workers] = 150 +default[:apache][:event][:max_connections_per_child] = 0 default[:apache][:listen_address] = "*" diff --git a/cookbooks/apache/templates/default/httpd.conf.erb b/cookbooks/apache/templates/default/httpd.conf.erb index f181ba7cf..9c80314b0 100644 --- a/cookbooks/apache/templates/default/httpd.conf.erb +++ b/cookbooks/apache/templates/default/httpd.conf.erb @@ -15,7 +15,7 @@ ServerLimit <%= node[:apache][:prefork][:server_limit] %> MinSpareServers <%= node[:apache][:prefork][:min_spare_servers] %> MaxSpareServers <%= node[:apache][:prefork][:max_spare_servers] %> MaxRequestWorkers <%= node[:apache][:prefork][:max_request_workers] %> -MaxRequestsPerChild <%= node[:apache][:prefork][:max_requests_per_child] %> +MaxConnectionsPerChild <%= node[:apache][:prefork][:max_connections_per_child] %> <% end -%> <% if node[:apache][:mpm] == "worker" -%> @@ -29,7 +29,7 @@ MaxSpareThreads <%= node[:apache][:worker][:max_spare_threads] %> ThreadLimit <%= node[:apache][:worker][:thread_limit] %> ThreadsPerChild <%= node[:apache][:worker][:threads_per_child] %> MaxRequestWorkers <%= node[:apache][:worker][:max_request_workers] %> -MaxRequestsPerChild <%= node[:apache][:worker][:max_requests_per_child] %> +MaxConnectionsPerChild <%= node[:apache][:worker][:max_connections_per_child] %> <% end -%> <% if node[:apache][:mpm] == "event" -%> @@ -43,7 +43,7 @@ MaxSpareThreads <%= node[:apache][:event][:max_spare_threads] %> ThreadLimit <%= node[:apache][:event][:thread_limit] %> ThreadsPerChild <%= node[:apache][:event][:threads_per_child] %> MaxRequestWorkers <%= node[:apache][:event][:max_request_workers] %> -MaxRequestsPerChild <%= node[:apache][:event][:max_requests_per_child] %> +MaxConnectionsPerChild <%= node[:apache][:event][:max_connections_per_child] %> <% end -%> # Default to UTF-8 diff --git a/roles/dev.rb b/roles/dev.rb index 9522ed62f..928d70676 100644 --- a/roles/dev.rb +++ b/roles/dev.rb @@ -92,7 +92,7 @@ default_attributes( :server_limit => 32, :max_request_workers => 800, :threads_per_child => 50, - :max_requests_per_child => 10000 + :max_connections_per_child => 10000 } }, :apt => { diff --git a/roles/shenron.rb b/roles/shenron.rb index 51d697e88..9323c23ce 100644 --- a/roles/shenron.rb +++ b/roles/shenron.rb @@ -13,7 +13,7 @@ default_attributes( :apache => { :mpm => "event", :event => { - :max_requests_per_child => 2000 + :max_connections_per_child => 2000 } }, :hardware => { diff --git a/roles/taginfo.rb b/roles/taginfo.rb index a0a3f9787..e94c3130f 100644 --- a/roles/taginfo.rb +++ b/roles/taginfo.rb @@ -21,7 +21,7 @@ default_attributes( :min_spare_threads => 50, :max_spare_threads => 150, :threads_per_child => 50, - :max_requests_per_child => 10000 + :max_connections_per_child => 10000 } }, :taginfo => { diff --git a/roles/tile.rb b/roles/tile.rb index a126bc169..4d226961a 100644 --- a/roles/tile.rb +++ b/roles/tile.rb @@ -19,7 +19,7 @@ default_attributes( :threads_per_child => 20, :min_spare_threads => 30, :max_spare_threads => 180, - :max_requests_per_child => 100000 + :max_connections_per_child => 100000 } }, :munin => { diff --git a/roles/web-backend.rb b/roles/web-backend.rb index 3474840e8..4c6dff43f 100644 --- a/roles/web-backend.rb +++ b/roles/web-backend.rb @@ -5,7 +5,7 @@ default_attributes( :apache => { :mpm => "worker", :worker => { - :max_requests_per_child => 10000 + :max_connections_per_child => 10000 } }, :logstash => { diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb index 646735bf2..d6c144a68 100644 --- a/roles/web-frontend.rb +++ b/roles/web-frontend.rb @@ -10,7 +10,7 @@ default_attributes( :min_spare_threads => 50, :max_spare_threads => 150, :threads_per_child => 50, - :max_requests_per_child => 10000 + :max_connections_per_child => 10000 } }, :logstash => { diff --git a/roles/wiki.rb b/roles/wiki.rb index 1ce53771f..9298395af 100644 --- a/roles/wiki.rb +++ b/roles/wiki.rb @@ -41,7 +41,7 @@ default_attributes( :server_limit => 32, :max_request_workers => 800, :threads_per_child => 50, - :max_requests_per_child => 10000 + :max_connections_per_child => 10000 } } ) -- 2.43.2