From bd06933fd5bcb4a131b684d696bb02a57003daab Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sat, 3 Dec 2022 11:04:53 +0000 Subject: [PATCH] tile: Fix Mac ARM compatibility (kitchen) --- cookbooks/tile/templates/default/render-lowzoom.erb | 2 +- cookbooks/tile/templates/default/renderd.conf.erb | 2 +- cookbooks/tile/templates/default/update-lowzoom.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cookbooks/tile/templates/default/render-lowzoom.erb b/cookbooks/tile/templates/default/render-lowzoom.erb index 95e4ed6e8..c03181399 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] - 1 %> \ + --num-threads=<%= [4, node.dig('cpu', 'total').to_i - 1, node.dig('cpu', 'cores').to_i - 1].max %> \ --map="<%= style %>" \ --max-load=<%= node[:cpu][:total] %> \ --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 8f441db2c..60206d1ce 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] - 1 %> +num_threads=<%= [4, node.dig('cpu', 'total').to_i - 1, node.dig('cpu', 'cores').to_i - 1].max %> 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 85f32c13d..c70374de9 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] - 1 %> \ + --num-threads=<%= [4, node.dig('cpu', 'total').to_i - 1, node.dig('cpu', 'cores').to_i - 1].max %> \ --map="<%= @style %>" \ --max-load=<%= node[:cpu][:total] %> \ --min-zoom=0 --max-zoom=12 -- 2.39.5