Remove code to disable JIT and parallel query during replication

[chef.git] / cookbooks / tile / templates / default / replicate.erb

diff --git a/cookbooks/tile/templates/default/replicate.erb b/cookbooks/tile/templates/default/replicate.erb
index 8ebfd94a55ecfce888b4fdc8daf619831dcacdf7..eedf4e5763d3badfc71771166481074bfc6de7a8 100644 (file)
--- a/cookbooks/tile/templates/default/replicate.erb
+++ b/cookbooks/tile/templates/default/replicate.erb
@@ -31,7 +31,7 @@ do
     cp sequence.txt sequence-prev.txt
 
     # Fetch the next set of changes
     cp sequence.txt sequence-prev.txt
 
     # Fetch the next set of changes

-    pyosmium-get-changes --sequence-file=sequence.txt --outfile=${file}
+    pyosmium-get-changes --server=<%= node[:tile][:replication][:url] %> --sequence-file=sequence.txt --outfile=${file}

 
     # Save exit status
     status=$?
 
     # Save exit status
     status=$?


@@ -47,21 +47,37 @@ do
 
         # Apply the changes to the database
         osm2pgsql --database gis --slim --append --number-processes=1 \
 
         # Apply the changes to the database
         osm2pgsql --database gis --slim --append --number-processes=1 \

-<% if node[:tile][:node_file] -%>
-                  --flat-nodes=<%= node[:tile][:node_file] %> \
+<% if node[:tile][:database][:node_file] -%>
+                  --flat-nodes=<%= node[:tile][:database][:node_file] %> \

 <% end -%>
 <% end -%>

-<% if node[:tile][:styles][:default][:revision] >= "v4.0.0" -%>
-                  --multi-geometry --hstore \
-                  --style=/srv/tile.openstreetmap.org/styles/default/openstreetmap-carto.style \
-                  --tag-transform-script=/srv/tile.openstreetmap.org/styles/default/openstreetmap-carto.lua \
+<% if node[:tile][:database][:multi_geometry] -%>
+                  --multi-geometry \
+<% end -%>
+<% if node[:tile][:database][:hstore] -%>
+                  --hstore \
+<% end -%>
+<% if node[:tile][:database][:style_file] -%>
+                  --style=<%= node[:tile][:database][:style_file] %> \
+<% end -%>
+<% if node[:tile][:database][:tag_transform_script] -%>
+                  --tag-transform-script=<%= node[:tile][:database][:tag_transform_script] %> \

 <% end -%>
                   ${file}
 
         # No need to rollback now
         rm sequence-prev.txt
 
 <% end -%>
                   ${file}
 
         # No need to rollback now
         rm sequence-prev.txt
 

+        # Get buffer count
+        buffers=$(osmium fileinfo --extended --get=data.buffers.count ${file})
+
+        # If this diff has content mark it as the latest diff
+        if [ $buffers -gt 0 ]
+        then
+            ln -f ${file} changes-latest.osc.gz
+        fi
+

         # Queue these changes for expiry processing
         # Queue these changes for expiry processing

-        ln ${file} expire-queue/$file
+        ln ${file} expire-queue/${file}

 
         # Delete old downloads
         find . -name 'changes-*.gz' -mmin +300 -exec rm -f {} \;
 
         # Delete old downloads
         find . -name 'changes-*.gz' -mmin +300 -exec rm -f {} \;