From: Tom Hughes <tom@compton.nu>
Date: Wed, 30 Dec 2020 10:03:49 +0000 (+0000)
Subject: Merge remote-tracking branch 'github/pull/378'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/c21a743049e784dba40c58d00379dc62d578cdb9?hp=1dd7226fd21af65033f73d5eb6f6643161749695

Merge remote-tracking branch 'github/pull/378'
---

diff --git a/cookbooks/tile/templates/default/render-lowzoom.erb b/cookbooks/tile/templates/default/render-lowzoom.erb
index 55a98a754..390244a62 100644
--- 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 \
-    --num-threads=<%= node[:cpu][:total] - 2 %> \
+    --num-threads=<%= node[:cpu][:total] - 1 %> \
     --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 69479e0b0..d02202d06 100644
--- 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
-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
 
diff --git a/cookbooks/tile/templates/default/update-lowzoom.erb b/cookbooks/tile/templates/default/update-lowzoom.erb
index 277c71fc6..ce91eb48f 100644
--- 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 \
-    --num-threads=<%= node[:cpu][:total] - 2 %> \
+    --num-threads=<%= node[:cpu][:total] - 1 %> \
     --map="<%= @style %>" \
     --max-load=70 \
     --min-zoom=0 --max-zoom=12