X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ba17fa1c38b58aafdc32e0859ba4fda12502d8ec..0d8030b3a7ec9eaa6bc96c7dd39d835a00a7ace0:/cookbooks/tile/templates/default/replicate.erb?ds=sidebyside diff --git a/cookbooks/tile/templates/default/replicate.erb b/cookbooks/tile/templates/default/replicate.erb index f996afb04..81fc66419 100644 --- 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,83 @@ 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 --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 - - # Remember the previous sequence number - prevSequenceNumber=$sequenceNumber + set -e - # Read in new state - . state.txt + # Log the new data + echo "Fetched new data from $(cat sequence-prev.txt) to $(cat sequence.txt) into ${file}" - # Did we get any new data? - if [ "${sequenceNumber}" == "${prevSequenceNumber}" ] - then - # Log the lack of data - echo "No new data available. Sleeping..." + # 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] %> \ +<% 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 \ +<% end -%> + ${file} - # Remove file, it will just be an empty changeset - rm ${file} + # No need to rollback now + rm sequence-prev.txt - # Sleep for a short while - sleep 30 - else - # Log the new data - echo "Fetched new data from ${prevSequenceNumber} to ${sequenceNumber} into ${file}" + # Get buffer count + buffers=$(osmium fileinfo --extended --get=data.buffers.count ${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 -%> + # If this diff has content mark it as the latest diff + if [ $buffers -gt 0 ] + then + 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