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 f996afb04e4248637422f38d675796c5b600bf1b..eedf4e5763d3badfc71771166481074bfc6de7a8 100644 (file)
--- a/cookbooks/tile/templates/default/replicate.erb
+++ b/cookbooks/tile/templates/default/replicate.erb
@@ -2,9 +2,15 @@
 
 # DO NOT EDIT - This file is being maintained by Chef
 
-# Initialize timestamp with day of latest planet dump
-# Setting to midnight ensures we get conistent data after first run
-# osmosis --read-replication-interval-init
+# Before running updates, the replication needs to be set up with the timestamp
+# set to the day of the latest planet dump. Setting to midnight ensures we get
+# conistent data after first run. osmosis --read-replication-interval-init is
+# used to initially create the state file
+
+# Define exit handler
+function onexit {
+    [ -f sequence-prev.txt ] && mv sequence-prev.txt sequence.txt
+}
 
 # Send output to the log
 exec > /var/log/tile/replicate.log 2>&1
@@ -12,66 +18,90 @@ exec > /var/log/tile/replicate.log 2>&1
 # Change to the replication state directory
 cd /var/lib/replicate
 
-# Read in initial state
-. state.txt
+# Install exit handler
+trap onexit EXIT
 
 # Loop indefinitely
 while true
 do
     # Work out the name of the next file
-    file="changes-${sequenceNumber}.osm.gz"
+    file="changes-$(cat sequence.txt).osc.gz"
+
+    # Save sequence file so we can rollback if an error occurs
+    cp sequence.txt sequence-prev.txt
 
     # Fetch the next set of changes
-    osmosis --read-replication-interval --simc --write-xml-change file="${file}" compressionMethod="gzip"
+    pyosmium-get-changes --server=<%= node[:tile][:replication][:url] %> --sequence-file=sequence.txt --outfile=${file}
+
+    # Save exit status
+    status=$?
 
     # Check for errors
-    if [ $? -eq 0 ]
+    if [ $status -eq 0 ]
     then
         # Enable exit on error
-       set -e
+        set -e
 
-        # Remember the previous sequence number
-       prevSequenceNumber=$sequenceNumber
+        # Log the new data
+        echo "Fetched new data from $(cat sequence-prev.txt) to $(cat sequence.txt) into ${file}"
 
-        # Read in new state
-       . state.txt
+        # Apply the changes to the database
+        osm2pgsql --database gis --slim --append --number-processes=1 \
+<% if node[:tile][:database][:node_file] -%>
+                  --flat-nodes=<%= node[:tile][:database][:node_file] %> \
+<% end -%>
+<% 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}
 
-        # Did we get any new data?
-       if [ "${sequenceNumber}" == "${prevSequenceNumber}" ]
+        # 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
-            # Log the lack of data
-           echo "No new data available. Sleeping..."
-
-           # Remove file, it will just be an empty changeset
-           rm ${file}
-
-            # Sleep for a short while
-           sleep 30
-       else
-            # Log the new data
-           echo "Fetched new data from ${prevSequenceNumber} to ${sequenceNumber} into ${file}"
-
-            # Apply the changes to the database
-<% if node[:tile][:node_file] -%>
-            osm2pgsql --slim --append --flat-nodes=<%= node[:tile][:node_file] %> ${file}
-<% else -%>
-            osm2pgsql --slim --append ${file}
-<% end -%>
+            ln -f ${file} changes-latest.osc.gz
+        fi
 
-            # Expire tiles which are touched by the changes
-            /usr/local/bin/expire-tiles ${file} > /dev/null 2>&1 &
-       fi
+        # Queue these changes for expiry processing
+        ln ${file} expire-queue/${file}
 
         # Delete old downloads
-       find . -name 'changes-*.gz' -mmin +300 -exec rm -f {} \;
+        find . -name 'changes-*.gz' -mmin +300 -exec rm -f {} \;
 
         # Disable exit on error
         set +e
+    elif [ $status -eq 3 ]
+    then
+        # Log the lack of data
+        echo "No new data available. Sleeping..."
+
+        # Remove file, it will just be an empty changeset
+        rm ${file}
+
+        # Sleep for a short while
+        sleep 30
     else
         # Log our failure to fetch changes
-       echo "Failed to fetch changes - waiting a few minutes before retry"
+        echo "Failed to fetch changes - waiting a few minutes before retry"
+
+        # Remove any output that was produced
+        rm -f ${file}
 
         # Wait five minutes and have another go
-       sleep 300
+        sleep 300
     fi
 done