tile: lower low zoom threads further

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 4df7c25547dd60a14891c6a348a217006557f4ed..961d71ea21cfe19f8bba44f123b7a69136d2ae6c 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -107,6 +107,8 @@ systemd_service "renderd" do
   after "postgresql.service"
   wants "postgresql.service"
   limit_nofile 4096
   after "postgresql.service"
   wants "postgresql.service"
   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


@@ -280,6 +282,8 @@ end
 
 nodejs_package "carto"
 
 
 nodejs_package "carto"
 

+lowzoom_threads = [node.cpu_cores - 1, node[:memory][:total].to_f / 6291456].min.floor
+

 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"


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


@@ -509,167 +513,94 @@ package %w[
   osm2pgsql
   osmium-tool
   pyosmium
   osm2pgsql
   osmium-tool
   pyosmium

-  python3-pyproj

 ]
 
 ]
 

-remote_directory "/usr/local/bin" do
-  source "bin"
-  owner "root"
-  group "root"
-  mode "755"
-  files_owner "root"
-  files_group "root"
-  files_mode "755"
-end
-

 directory "/var/lib/replicate" do
   owner "tile"
   group "tile"
   mode "755"
 end
 
 directory "/var/lib/replicate" do
   owner "tile"
   group "tile"
   mode "755"
 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
-
-  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
+template "/usr/local/bin/expire-tiles" do
+  source "expire-tiles.erb"
+  owner "root"
+  group "root"
+  mode "755"
+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"
-  template "/usr/local/bin/expire-tiles" do
-    source "expire-tiles-osm2pgsql.erb"
-    owner "root"
-    group "root"
-    mode "755"
-  end
+directory "/var/lib/replicate/expire-queue" do
+  owner "tile"
+  group "_renderd"
+  mode "775"
+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"
+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
+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

 
 

-  systemd_path "expire-tiles" do
-    description "Tile dirtying trigger"
-    directory_not_empty "/var/lib/replicate/expire-queue"
-  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
+service "expire-tiles.path" do
+  action [:enable, :start]
+  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
+template "/usr/local/bin/replicate-post" do
+  source "replicate-post.erb"
+  owner "root"
+  group "root"
+  mode "755"
+end

 
 

-  osm2pgsql_arguments = %w[
+osm2pgsql_arguments = %w[

     --number-processes=1
     --log-progress=false
     --expire-tiles=13-19
     --expire-output=/var/lib/replicate/dirty-tiles.txt
   ]
 
     --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]
+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/replicate-post -- #{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
+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

 
 

-  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


@@ -677,6 +608,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