Match number of apache workers on tile servers to the CPU count

diff --git a/cookbooks/tile/attributes/default.rb b/cookbooks/tile/attributes/default.rb
index 3d32e5632f5e0dcf9cc86fa435af7901832ea8ca..c471f2475bfe4666f0bb6d1fef0151c0e771e04b 100644 (file)
--- a/cookbooks/tile/attributes/default.rb
+++ b/cookbooks/tile/attributes/default.rb
@@ -17,3 +17,7 @@ default[:postgresql][:versions] |= [node[:tile][:database][:cluster].split("/").
 default[:postgresql][:monitor_database] = "gis"
 
 default[:accounts][:users][:tile][:status] = :role
 default[:postgresql][:monitor_database] = "gis"
 
 default[:accounts][:users][:tile][:status] = :role

+
+default[:apache][:event][:server_limit] = node.cpu_cores * 5 / 4
+default[:apache][:event][:max_request_workers] = node.cpu_cores * node[:apache][:event][:threads_per_child]
+default[:apache][:event][:max_spare_threads] = node.cpu_cores * node[:apache][:event][:threads_per_child]

diff --git a/roles/tile.rb b/roles/tile.rb
index ce4e4a67e691ca581d5f9dd760520ae43d009187..6bb3dc9023f340283e70f1fc77e14d50a3562743 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -14,11 +14,8 @@ default_attributes(
     :mpm => "event",
     :timeout => 60,
     :event => {
     :mpm => "event",
     :timeout => 60,
     :event => {

-      :server_limit => 80,
-      :max_request_workers => 1200,

       :threads_per_child => 20,
       :min_spare_threads => 300,
       :threads_per_child => 20,
       :min_spare_threads => 300,

-      :max_spare_threads => 1200,

       :max_connections_per_child => 0,
       :async_request_worker_factor => 4,
       :listen_cores_buckets_ratio => 8
       :max_connections_per_child => 0,
       :async_request_worker_factor => 4,
       :listen_cores_buckets_ratio => 8