X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/87df439f794f54da38a2cbbd01b8e81fb821cefa..ebca8a93face949a54f319048af8708bbeb88b25:/cookbooks/tile/recipes/default.rb

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index f642aafb8..2ebcbf041 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -20,7 +20,6 @@
 include_recipe "accounts"
 include_recipe "apache"
 include_recipe "git"
-include_recipe "munin"
 include_recipe "nodejs"
 include_recipe "postgresql"
 include_recipe "prometheus"
@@ -100,16 +99,23 @@ tile_directories = node[:tile][:styles].collect do |_, style|
   style[:tile_directories].collect { |directory| directory[:name] }
 end.flatten.sort.uniq
 
-package "renderd"
+package %w[
+  renderd
+  libgoogle-perftools4
+]
 
 systemd_service "renderd" do
   dropin "chef"
   after "postgresql.service"
   wants "postgresql.service"
+  environment "LD_PRELOAD" => "libtcmalloc.so.4"
   limit_nofile 4096
+  memory_high "80%"
+  memory_max "90%"
   sandbox true
   restrict_address_families "AF_UNIX"
   read_write_paths tile_directories
+  system_call_filter ["@system-service", "mincore"]
   restart "on-failure"
 end
 
@@ -153,14 +159,11 @@ end
 package %w[
   python3-cairo
   python3-mapnik
+  python3-pyotp
   python3-pyproj
   python3-setuptools
 ]
 
-python_package "pyotp" do
-  python_version "3"
-end
-
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"
@@ -280,6 +283,8 @@ end
 
 nodejs_package "carto"
 
+lowzoom_threads = node.cpu_cores - 1
+
 systemd_service "update-lowzoom@" do
   description "Low zoom tile update service for %i layer"
   user "tile"
@@ -310,7 +315,7 @@ node[:tile][:styles].each do |name, details|
     owner "root"
     group "root"
     mode "755"
-    variables :style => name
+    variables :style => name, :threads => lowzoom_threads
   end
 
   service "update-lowzoom@#{name}" do
@@ -481,11 +486,6 @@ if node[:tile][:database][:external_data_script]
   end
 end
 
-postgresql_munin "gis" do
-  cluster node[:tile][:database][:cluster]
-  database "gis"
-end
-
 directory File.dirname(node[:tile][:database][:node_file]) do
   owner "root"
   group "root"
@@ -509,17 +509,19 @@ package %w[
   osm2pgsql
   osmium-tool
   pyosmium
-  python3-pyproj
 ]
 
-remote_directory "/usr/local/bin" do
-  source "bin"
-  owner "root"
-  group "root"
+directory node[:tile][:replication][:directory] do
+  owner "tile"
+  group "tile"
   mode "755"
-  files_owner "root"
-  files_group "root"
-  files_mode "755"
+end
+
+link "/var/lib/replicate" do
+  to node[:tile][:replication][:directory]
+  owner "tile"
+  group "tile"
+  not_if { node[:tile][:replication][:directory] == "/var/lib/replicate" }
 end
 
 template "/usr/local/bin/expire-tiles" do
@@ -529,12 +531,6 @@ template "/usr/local/bin/expire-tiles" do
   mode "755"
 end
 
-directory "/var/lib/replicate" do
-  owner "tile"
-  group "tile"
-  mode "755"
-end
-
 directory "/var/lib/replicate/expire-queue" do
   owner "tile"
   group "_renderd"
@@ -546,7 +542,6 @@ template "/usr/local/bin/replicate" do
   owner "root"
   group "root"
   mode "755"
-  variables :postgresql_version => postgresql_version.to_f
 end
 
 systemd_service "expire-tiles" do
@@ -555,13 +550,11 @@ systemd_service "expire-tiles" do
   user "_renderd"
   exec_start "/usr/local/bin/expire-tiles"
   nice 10
-  standard_output "null"
   sandbox true
+  restrict_address_families "AF_UNIX"
   read_write_paths tile_directories + [
-    "/store/database/nodes",
-    "/var/lib/replicate/expire-queue",
-    "/var/log/tile"
-  ]
+                     "/var/lib/replicate/expire-queue"
+                   ]
 end
 
 systemd_path "expire-tiles" do
@@ -574,6 +567,13 @@ service "expire-tiles.path" do
   subscribes :restart, "systemd_path[expire-tiles]"
 end
 
+template "/usr/local/bin/replicate-post" do
+  source "replicate-post.erb"
+  owner "root"
+  group "root"
+  mode "755"
+end
+
 systemd_service "replicate" do
   description "Rendering database replication service"
   after "postgresql.service"
@@ -584,8 +584,7 @@ systemd_service "replicate" do
   restrict_address_families "AF_UNIX"
   read_write_paths [
     "/store/database/nodes",
-    "/var/lib/replicate",
-    "/var/log/tile"
+    "/var/lib/replicate"
   ]
   restart "on-failure"
 end
@@ -601,6 +600,7 @@ template "/usr/local/bin/render-lowzoom" do
   owner "root"
   group "root"
   mode "755"
+  variables :threads => lowzoom_threads
 end
 
 systemd_service "render-lowzoom" do
@@ -615,7 +615,7 @@ end
 
 systemd_timer "render-lowzoom" do
   description "Render low zoom tiles"
-  on_calendar "Fri *-*-* 23:00:00 UTC"
+  on_calendar "23:00 #{node[:timezone]}"
 end
 
 service "render-lowzoom.timer" do
@@ -656,19 +656,6 @@ tile_directories.each do |directory|
   end
 end
 
-munin_plugin "mod_tile_fresh"
-munin_plugin "mod_tile_latency"
-munin_plugin "mod_tile_response"
-munin_plugin "mod_tile_zoom"
-
-munin_plugin "renderd_processed"
-munin_plugin "renderd_queue"
-munin_plugin "renderd_queue_time"
-munin_plugin "renderd_zoom"
-munin_plugin "renderd_zoom_time"
-
-munin_plugin "replication_delay"
-
 package "ruby-webrick"
 
 prometheus_exporter "modtile" do