Add support for installing functions to a rendering database

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index bfedc3c170ff4ef2bf239fe6269d46f7e89ea3ed..ddc7e490e4bf929cccfcd59fcc203cb2fc295b7a 100644 (file)
--- 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 "accounts"
 include_recipe "apache"
 include_recipe "git"

-include_recipe "munin"

 include_recipe "nodejs"
 include_recipe "postgresql"
 include_recipe "prometheus"
 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
 
   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
 


@@ -153,14 +159,11 @@ end
 package %w[
   python3-cairo
   python3-mapnik
 package %w[
   python3-cairo
   python3-mapnik

+  python3-pyotp

   python3-pyproj
   python3-setuptools
 ]
 
   python3-pyproj
   python3-setuptools
 ]
 

-python_package "pyotp" do
-  python_version "3"
-end
-

 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"


@@ -280,6 +283,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"


@@ -295,6 +300,72 @@ systemd_service "update-lowzoom@" do
   restart "on-failure"
 end
 
   restart "on-failure"
 end
 

+postgresql_version = node[:tile][:database][:cluster].split("/").first
+postgis_version = node[:tile][:database][:postgis]
+
+package "postgresql-#{postgresql_version}-postgis-#{postgis_version}"
+
+postgresql_user "jburgess" do
+  cluster node[:tile][:database][:cluster]
+  superuser true
+end
+
+postgresql_user "tomh" do
+  cluster node[:tile][:database][:cluster]
+  superuser true
+end
+
+postgresql_user "pnorman" do
+  cluster node[:tile][:database][:cluster]
+  superuser true
+end
+
+postgresql_user "tile" do
+  cluster node[:tile][:database][:cluster]
+end
+
+postgresql_user "www-data" do
+  cluster node[:tile][:database][:cluster]
+end
+
+postgresql_user "_renderd" do
+  cluster node[:tile][:database][:cluster]
+end
+
+postgresql_database "gis" do
+  cluster node[:tile][:database][:cluster]
+  owner "tile"
+end
+
+postgresql_extension "postgis" do
+  cluster node[:tile][:database][:cluster]
+  database "gis"
+end
+
+postgresql_extension "hstore" do
+  cluster node[:tile][:database][:cluster]
+  database "gis"
+  only_if { node[:tile][:database][:hstore] }
+end
+
+%w[geography_columns planet_osm_nodes planet_osm_rels planet_osm_ways raster_columns raster_overviews].each do |table|
+  postgresql_table table do
+    cluster node[:tile][:database][:cluster]
+    database "gis"
+    owner "tile"
+    permissions "tile" => :all
+  end
+end
+
+%w[geometry_columns planet_osm_line planet_osm_point planet_osm_polygon planet_osm_roads spatial_ref_sys].each do |table|
+  postgresql_table table do
+    cluster node[:tile][:database][:cluster]
+    database "gis"
+    owner "tile"
+    permissions "tile" => :all, "www-data" => :select, "_renderd" => :select
+  end
+end
+

 directory "/srv/tile.openstreetmap.org/styles" do
   owner "tile"
   group "tile"
 directory "/srv/tile.openstreetmap.org/styles" do
   owner "tile"
   group "tile"


@@ -310,7 +381,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


@@ -378,6 +449,18 @@ node[:tile][:styles].each do |name, details|
     end
   end
 
     end
   end
 

+  if details[:functions_script]
+    postgresql_execute details[:functions_script] do
+      action :nothing
+      command details[:functions_script]
+      cluster node[:tile][:database][:cluster]
+      database "gis"
+      user "tile"
+      group "tile"
+      subscribes :run, "git[#{style_directory}]"
+    end
+  end
+

   execute "#{style_directory}/project.mml" do
     action :nothing
     command "carto -a 3.0.22 project.mml > project.xml"
   execute "#{style_directory}/project.mml" do
     action :nothing
     command "carto -a 3.0.22 project.mml > project.xml"


@@ -390,72 +473,6 @@ node[:tile][:styles].each do |name, details|
   end
 end
 
   end
 end
 

-postgresql_version = node[:tile][:database][:cluster].split("/").first
-postgis_version = node[:tile][:database][:postgis]
-
-package "postgresql-#{postgresql_version}-postgis-#{postgis_version}"
-
-postgresql_user "jburgess" do
-  cluster node[:tile][:database][:cluster]
-  superuser true
-end
-
-postgresql_user "tomh" do
-  cluster node[:tile][:database][:cluster]
-  superuser true
-end
-
-postgresql_user "pnorman" do
-  cluster node[:tile][:database][:cluster]
-  superuser true
-end
-
-postgresql_user "tile" do
-  cluster node[:tile][:database][:cluster]
-end
-
-postgresql_user "www-data" do
-  cluster node[:tile][:database][:cluster]
-end
-
-postgresql_user "_renderd" do
-  cluster node[:tile][:database][:cluster]
-end
-
-postgresql_database "gis" do
-  cluster node[:tile][:database][:cluster]
-  owner "tile"
-end
-
-postgresql_extension "postgis" do
-  cluster node[:tile][:database][:cluster]
-  database "gis"
-end
-
-postgresql_extension "hstore" do
-  cluster node[:tile][:database][:cluster]
-  database "gis"
-  only_if { node[:tile][:database][:hstore] }
-end
-
-%w[geography_columns planet_osm_nodes planet_osm_rels planet_osm_ways raster_columns raster_overviews].each do |table|
-  postgresql_table table do
-    cluster node[:tile][:database][:cluster]
-    database "gis"
-    owner "tile"
-    permissions "tile" => :all
-  end
-end
-
-%w[geometry_columns planet_osm_line planet_osm_point planet_osm_polygon planet_osm_roads spatial_ref_sys].each do |table|
-  postgresql_table table do
-    cluster node[:tile][:database][:cluster]
-    database "gis"
-    owner "tile"
-    permissions "tile" => :all, "www-data" => :select, "_renderd" => :select
-  end
-end
-

 package %w[
   gdal-bin
   python3-yaml
 package %w[
   gdal-bin
   python3-yaml


@@ -481,11 +498,6 @@ if node[:tile][:database][:external_data_script]
   end
 end
 
   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"
 directory File.dirname(node[:tile][:database][:node_file]) do
   owner "root"
   group "root"


@@ -509,147 +521,90 @@ package %w[
   osm2pgsql
   osmium-tool
   pyosmium
   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"
   mode "755"

-  files_owner "root"
-  files_group "root"
-  files_mode "755"

 end
 
 end
 

-directory "/var/lib/replicate" do
+link "/var/lib/replicate" do
+  to node[:tile][:replication][:directory]

   owner "tile"
   group "tile"
   owner "tile"
   group "tile"

-  mode "755"
+  not_if { node[:tile][:replication][:directory] == "/var/lib/replicate" }

 end
 
 end
 

-if node[:tile][:replication][:engine] == "custom"
-  template "/usr/local/bin/expire-tiles" do
-    source "expire-tiles-custom.erb"
-    owner "root"
-    group "root"
-    mode "755"
-  end
-
-  directory "/var/lib/replicate/expire-queue" do
-    owner "tile"
-    group "_renderd"
-    mode "775"
-  end
-
-  template "/usr/local/bin/replicate" do
-    source "replicate.erb"
-    owner "root"
-    group "root"
-    mode "755"
-    variables :postgresql_version => postgresql_version.to_f
-  end
-
-  systemd_service "expire-tiles" do
-    description "Tile dirtying service"
-    type "simple"
-    user "_renderd"
-    exec_start "/usr/local/bin/expire-tiles"
-    nice 10
-    sandbox true
-    read_write_paths tile_directories + [
-                       "/store/database/nodes",
-                       "/var/lib/replicate/expire-queue",
-                       "/var/log/tile"
-                     ]
-  end
-
-  systemd_path "expire-tiles" do
-    description "Tile dirtying trigger"
-    directory_not_empty "/var/lib/replicate/expire-queue"
-  end
-
-  service "expire-tiles.path" do
-    action [:enable, :start]
-    subscribes :restart, "systemd_path[expire-tiles]"
-  end
+template "/usr/local/bin/expire-tiles" do
+  source "expire-tiles.erb"
+  owner "root"
+  group "root"
+  mode "755"
+end

 
 

-  systemd_service "replicate" do
-    description "Rendering database replication service"
-    after "postgresql.service"
-    wants "postgresql.service"
-    user "tile"
-    exec_start "/usr/local/bin/replicate"
-    sandbox :enable_network => true
-    restrict_address_families "AF_UNIX"
-    read_write_paths [
-      "/store/database/nodes",
-      "/var/lib/replicate",
-      "/var/log/tile"
-    ]
-    restart "on-failure"
-  end
+directory "/var/lib/replicate/expire-queue" do
+  owner "tile"
+  group "_renderd"
+  mode "775"
+end

 
 

-  service "replicate" do
-    action [:enable, :start]
-    subscribes :restart, "template[/usr/local/bin/replicate]"
-    subscribes :restart, "systemd_service[replicate]"
-  end
-elsif node[:tile][:replication][:engine] == "osm2pgsql"
-  service "expire-tiles.path" do
-    action [:disable, :stop]
-  end
+template "/usr/local/bin/replicate" do
+  source "replicate.erb"
+  owner "root"
+  group "root"
+  mode "755"
+end

 
 

-  systemd_path "expire-tiles" do
-    action :delete
-  end
+systemd_service "expire-tiles" do
+  description "Tile dirtying service"
+  type "simple"
+  user "_renderd"
+  exec_start "/usr/local/bin/expire-tiles"
+  nice 10
+  sandbox true
+  restrict_address_families "AF_UNIX"
+  read_write_paths tile_directories + [
+                     "/var/lib/replicate/expire-queue"
+                   ]
+end

 
 

-  service "expire-tiles" do
-    action :stop
-  end
+systemd_path "expire-tiles" do
+  description "Tile dirtying trigger"
+  directory_not_empty "/var/lib/replicate/expire-queue"
+end

 
 

-  systemd_service "expire-tiles" do
-    action :delete
-  end
+service "expire-tiles.path" do
+  action [:enable, :start]
+  subscribes :restart, "systemd_path[expire-tiles]"
+end

 
 

-  template "/usr/local/bin/expire-tiles" do
-    source "expire-tiles-osm2pgsql.erb"
-    owner "root"
-    group "root"
-    mode "755"
-  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
+systemd_service "replicate" do
+  description "Rendering database replication service"
+  after "postgresql.service"
+  wants "postgresql.service"
+  user "tile"
+  exec_start "/usr/local/bin/replicate"
+  sandbox :enable_network => true
+  restrict_address_families "AF_UNIX"
+  read_write_paths [
+    "/store/database/nodes",
+    "/var/lib/replicate"

   ]
   ]

+  restart "on-failure"
+end

 
 

-  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"
-    wants "postgresql.service"
-    user "tile"
-    exec_start "/bin/osm2pgsql-replication update --database gis --post-processing /usr/local/bin/expire-tiles -- #{osm2pgsql_arguments.join(' ')}"
-    sandbox :enable_network => true
-    restrict_address_families "AF_UNIX"
-    read_write_paths [
-      "/store/database/nodes",
-      "/var/lib/replicate"
-    ]
-    restart "always"
-    restart_sec 30
-  end
-
-  service "replicate" do
-    action [:enable, :start]
-    subscribes :restart, "systemd_service[replicate]"
-  end
+service "replicate" do
+  action [:enable, :start]
+  subscribes :restart, "template[/usr/local/bin/replicate]"
+  subscribes :restart, "systemd_service[replicate]"

 end
 
 template "/usr/local/bin/render-lowzoom" do
 end
 
 template "/usr/local/bin/render-lowzoom" do


@@ -657,6 +612,7 @@ template "/usr/local/bin/render-lowzoom" do
   owner "root"
   group "root"
   mode "755"
   owner "root"
   group "root"
   mode "755"

+  variables :threads => lowzoom_threads

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


@@ -671,7 +627,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


@@ -712,19 +668,6 @@ tile_directories.each do |directory|
   end
 end
 
   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
 package "ruby-webrick"
 
 prometheus_exporter "modtile" do