Drop memory constraint on low zoom render threads

[chef.git] / cookbooks / tile / recipes / default.rb

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 979c012d536de878485727d077af7cbf3cd66c2c..6cfe88d45f31ff69540737cbd908a0a365292b25 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -96,32 +96,27 @@ directory "/srv/tile.openstreetmap.org" do
   mode "755"
 end
 
   mode "755"
 end
 

-directory "/srv/tile.openstreetmap.org/conf" do
-  owner "tile"
-  group "tile"
-  mode "755"
-end
-
-file "/srv/tile.openstreetmap.org/conf/ip.map" do
-  owner "tile"
-  group "adm"
-  mode "644"
-end
-

 tile_directories = node[:tile][:styles].collect do |_, style|
   style[:tile_directories].collect { |directory| directory[:name] }
 end.flatten.sort.uniq
 
 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"
 
 systemd_service "renderd" do
   dropin "chef"
   after "postgresql.service"
   wants "postgresql.service"

+  environment "LD_PRELOAD" => "libtcmalloc.so.4"

   limit_nofile 4096
   limit_nofile 4096

+  memory_high "80%"
+  memory_max "90%"

   sandbox true
   restrict_address_families "AF_UNIX"
   read_write_paths tile_directories
   sandbox true
   restrict_address_families "AF_UNIX"
   read_write_paths tile_directories

+  system_call_filter ["@system-service", "mincore"]

   restart "on-failure"
 end
 
   restart "on-failure"
 end
 


@@ -292,6 +287,8 @@ end
 
 nodejs_package "carto"
 
 
 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"
 systemd_service "update-lowzoom@" do
   description "Low zoom tile update service for %i layer"
   user "tile"


@@ -322,7 +319,7 @@ node[:tile][:styles].each do |name, details|
     owner "root"
     group "root"
     mode "755"
     owner "root"
     group "root"
     mode "755"

-    variables :style => name
+    variables :style => name, :threads => lowzoom_threads

   end
 
   service "update-lowzoom@#{name}" do
   end
 
   service "update-lowzoom@#{name}" do


@@ -521,56 +518,14 @@ package %w[
   osm2pgsql
   osmium-tool
   pyosmium
   osm2pgsql
   osmium-tool
   pyosmium

-  python3-pyproj

 ]
 
 ]
 

-gem_package "apachelogregex" do
-  gem_binary node[:ruby][:gem]
-end
-
-gem_package "file-tail" do
-  gem_binary node[:ruby][:gem]
-end
-
-gem_package "lru_redux" do
-  gem_binary node[:ruby][:gem]
-end
-
-remote_directory "/usr/local/bin" do
-  source "bin"
-  owner "root"
-  group "root"
-  mode "755"
-  files_owner "root"
-  files_group "root"
-  files_mode "755"
-end
-
-template "/usr/local/bin/tile-ratelimit" do
-  source "tile-ratelimit.erb"
-  owner "root"
-  group "root"
+directory "/var/lib/replicate" do
+  owner "tile"
+  group "tile"

   mode "755"
 end
 
   mode "755"
 end
 

-systemd_service "tile-ratelimit" do
-  description "Monitor tile requests and enforce rate limits"
-  after "apache2.service"
-  user "tile"
-  group "adm"
-  exec_start "/usr/local/bin/tile-ratelimit"
-  nice 10
-  sandbox true
-  read_write_paths "/srv/tile.openstreetmap.org/conf"
-  restart "on-failure"
-end
-
-service "tile-ratelimit" do
-  action [:enable, :start]
-  subscribes :restart, "file[/usr/local/bin/tile-ratelimit]"
-  subscribes :restart, "systemd_service[tile-ratelimit]"
-end
-

 template "/usr/local/bin/expire-tiles" do
   source "expire-tiles.erb"
   owner "root"
 template "/usr/local/bin/expire-tiles" do
   source "expire-tiles.erb"
   owner "root"


@@ -578,12 +533,6 @@ template "/usr/local/bin/expire-tiles" do
   mode "755"
 end
 
   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"
 directory "/var/lib/replicate/expire-queue" do
   owner "tile"
   group "_renderd"


@@ -595,7 +544,6 @@ template "/usr/local/bin/replicate" do
   owner "root"
   group "root"
   mode "755"
   owner "root"
   group "root"
   mode "755"

-  variables :postgresql_version => postgresql_version.to_f

 end
 
 systemd_service "expire-tiles" do
 end
 
 systemd_service "expire-tiles" do


@@ -604,13 +552,11 @@ systemd_service "expire-tiles" do
   user "_renderd"
   exec_start "/usr/local/bin/expire-tiles"
   nice 10
   user "_renderd"
   exec_start "/usr/local/bin/expire-tiles"
   nice 10

-  standard_output "null"

   sandbox true
   sandbox true

+  restrict_address_families "AF_UNIX"

   read_write_paths tile_directories + [
   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
 end
 
 systemd_path "expire-tiles" do


@@ -623,6 +569,24 @@ service "expire-tiles.path" do
   subscribes :restart, "systemd_path[expire-tiles]"
 end
 
   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
+
+osm2pgsql_arguments = %w[
+    --number-processes=1
+    --log-progress=false
+    --expire-tiles=13-19
+    --expire-output=/var/lib/replicate/dirty-tiles.txt
+  ]
+
+osm2pgsql_arguments.append("--multi-geometry") if node[:tile][:database][:multi_geometry]
+osm2pgsql_arguments.append("--hstore") if node[:tile][:database][:hstore]
+osm2pgsql_arguments.append("--tag-transform-script=#{node[:tile][:database][:tag_transform_script]}") if node[:tile][:database][:tag_transform_script]
+

 systemd_service "replicate" do
   description "Rendering database replication service"
   after "postgresql.service"
 systemd_service "replicate" do
   description "Rendering database replication service"
   after "postgresql.service"


@@ -633,8 +597,7 @@ systemd_service "replicate" do
   restrict_address_families "AF_UNIX"
   read_write_paths [
     "/store/database/nodes",
   restrict_address_families "AF_UNIX"
   read_write_paths [
     "/store/database/nodes",

-    "/var/lib/replicate",
-    "/var/log/tile"
+    "/var/lib/replicate"

   ]
   restart "on-failure"
 end
   ]
   restart "on-failure"
 end


@@ -645,16 +608,12 @@ service "replicate" do
   subscribes :restart, "systemd_service[replicate]"
 end
 
   subscribes :restart, "systemd_service[replicate]"
 end
 

-# FIXME: cleanup old replicate logrotate
-file "/etc/logrotate.d/replicate" do
-  action :delete
-end
-

 template "/usr/local/bin/render-lowzoom" do
   source "render-lowzoom.erb"
   owner "root"
   group "root"
   mode "755"
 template "/usr/local/bin/render-lowzoom" do
   source "render-lowzoom.erb"
   owner "root"
   group "root"
   mode "755"

+  variables :threads => lowzoom_threads

 end
 
 systemd_service "render-lowzoom" do
 end
 
 systemd_service "render-lowzoom" do


@@ -669,7 +628,7 @@ end
 
 systemd_timer "render-lowzoom" do
   description "Render low zoom tiles"
 
 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
 end
 
 service "render-lowzoom.timer" do