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

openstreetmap · Sep 12, 2023 · e2e8d52 · e2e8d52
1 parent 5fde77f
commit e2e8d52
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cookbooks/tile/attributes/default.rb b/cookbooks/tile/attributes/default.rb
@@ -17,3 +17,7 @@
 default[:postgresql][:monitor_database] = "gis"
 
 default[:accounts][:users][:tile][:status] = :role
+
+default[:apache][:event][:server_limit] = node.cpu_cores * 1.25
+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
@@ -14,11 +14,8 @@
     :mpm => "event",
     :timeout => 60,
     :event => {
-      :server_limit => 80,
-      :max_request_workers => 1200,
       :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