Only reserve one CPU for other tasks on render servers

diff --git a/cookbooks/tile/templates/default/render-lowzoom.erb b/cookbooks/tile/templates/default/render-lowzoom.erb
index 55a98a754557af9e2478e0e1c952b6ed4b9f47cb..390244a62f4be4472ce5bdf61497cad05eb85125 100644 (file)
--- a/cookbooks/tile/templates/default/render-lowzoom.erb
+++ b/cookbooks/tile/templates/default/render-lowzoom.erb
@@ -16,7 +16,7 @@ function update_<%= style %>
     --timestamp=${timestamp} \
     --tile-dir=/srv/tile.openstreetmap.org/tiles \
     --socket=/var/run/renderd/renderd.sock \
     --timestamp=${timestamp} \
     --tile-dir=/srv/tile.openstreetmap.org/tiles \
     --socket=/var/run/renderd/renderd.sock \

-    --num-threads=<%= node[:cpu][:total] - 2 %> \
+    --num-threads=<%= node[:cpu][:total] - 1 %> \

     --map="<%= style %>" \
     --max-load=70 \
     --min-zoom=0 --max-zoom=12
     --map="<%= style %>" \
     --max-load=70 \
     --min-zoom=0 --max-zoom=12

diff --git a/cookbooks/tile/templates/default/renderd.conf.erb b/cookbooks/tile/templates/default/renderd.conf.erb
index 69479e0b013556ace35eb3079f6d1859a5edf9e1..d02202d066d0ab656989a0c698df5d1ce090c994 100644 (file)
--- a/cookbooks/tile/templates/default/renderd.conf.erb
+++ b/cookbooks/tile/templates/default/renderd.conf.erb
@@ -2,7 +2,7 @@
 
 [renderd]
 socketname=/var/run/renderd/renderd.sock
 
 [renderd]
 socketname=/var/run/renderd/renderd.sock

-num_threads=<%= node[:cpu][:total] - 2 %>
+num_threads=<%= node[:cpu][:total] - 1 %>

 tile_dir=/srv/tile.openstreetmap.org/tiles
 stats_file=/var/run/renderd/renderd.stats
 
 tile_dir=/srv/tile.openstreetmap.org/tiles
 stats_file=/var/run/renderd/renderd.stats
 

diff --git a/cookbooks/tile/templates/default/update-lowzoom.erb b/cookbooks/tile/templates/default/update-lowzoom.erb
index 277c71fc6f7f2d7c062739c614b6c0ec02b7e733..ce91eb48fafa98e902ee11299899d7cd83b36742 100644 (file)
--- a/cookbooks/tile/templates/default/update-lowzoom.erb
+++ b/cookbooks/tile/templates/default/update-lowzoom.erb
@@ -12,7 +12,7 @@ function update_tiles
     --timestamp=$(stat -c %Y "/srv/tile.openstreetmap.org/styles/<%= @style %>/project.xml") \
     --tile-dir=/srv/tile.openstreetmap.org/tiles \
     --socket=/var/run/renderd/renderd.sock \
     --timestamp=$(stat -c %Y "/srv/tile.openstreetmap.org/styles/<%= @style %>/project.xml") \
     --tile-dir=/srv/tile.openstreetmap.org/tiles \
     --socket=/var/run/renderd/renderd.sock \

-    --num-threads=<%= node[:cpu][:total] - 2 %> \
+    --num-threads=<%= node[:cpu][:total] - 1 %> \

     --map="<%= @style %>" \
     --max-load=70 \
     --min-zoom=0 --max-zoom=12
     --map="<%= @style %>" \
     --max-load=70 \
     --min-zoom=0 --max-zoom=12