Run osm2pgsql replication in a loop instead of relying on Restart=always

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 4df7c25547dd60a14891c6a348a217006557f4ed..3966954f8061fdea05c366247eb79e479610cd7c 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -543,7 +543,7 @@ if node[:tile][:replication][:engine] == "custom"
   end
 
   template "/usr/local/bin/replicate" do
-    source "replicate.erb"
+    source "replicate-custom.erb"
     owner "root"
     group "root"
     mode "755"
@@ -609,6 +609,13 @@ elsif node[:tile][:replication][:engine] == "osm2pgsql"
     mode "775"
   end
 
+  template "/usr/local/bin/replicate" do
+    source "replicate-osm2pgsql.erb"
+    owner "root"
+    group "root"
+    mode "755"
+  end
+
   systemd_service "expire-tiles" do
     description "Tile dirtying service"
     type "simple"
@@ -655,19 +662,19 @@ elsif node[:tile][:replication][:engine] == "osm2pgsql"
     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(' ')}"
+    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 "always"
-    restart_sec 30
+    restart "on-failure"
   end
 
   service "replicate" do
     action [:enable, :start]
+    subscribes :restart, "template[/usr/local/bin/replicate]"
     subscribes :restart, "systemd_service[replicate]"
   end
 end

diff --git a/cookbooks/tile/templates/default/replicate.erb b/cookbooks/tile/templates/default/replicate-custom.erb
similarity index 100%
rename from cookbooks/tile/templates/default/replicate.erb
rename to cookbooks/tile/templates/default/replicate-custom.erb

diff --git a/cookbooks/tile/templates/default/replicate-osm2pgsql.erb b/cookbooks/tile/templates/default/replicate-osm2pgsql.erb
new file mode 100644 (file)
index 0000000..88917df
--- /dev/null
+++ b/cookbooks/tile/templates/default/replicate-osm2pgsql.erb
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# DO NOT EDIT - This file is being maintained by Chef
+
+while [ 1 = 1 ]
+do
+  /bin/osm2pgsql-replication update \
+    --database gis \
+    --post-processing /usr/local/bin/replicate-post \
+    -- \
+    --number-processes=1 \
+    --log-progress=false \
+    --expire-tiles=13-19 \
+    --expire-output=/var/lib/replicate/dirty-tiles.txt \
+<% if node[:tile][:database][:multi_geometry] -%>
+    --multi-geometry \
+<% end -%>
+<% if node[:tile][:database][:hstore] -%>
+    --hstore \
+<% end -%>
+<% if node[:tile][:database][:tag_transform_script] -%>
+    --tag-transform-script=<%= node[:tile][:database][:tag_transform_script] %>
+<% end -%>
+
+    sleep 30
+done