X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/034d14c6a8837aa2db9a37a1037708e54bcbbe9c..2048bb113a8028ed340150e17c1bfc9fd90d31ef:/cookbooks/planet/templates/default/planetdump.erb

diff --git a/cookbooks/planet/templates/default/planetdump.erb b/cookbooks/planet/templates/default/planetdump.erb
index f88a4ff6b..dff206b35 100644
--- a/cookbooks/planet/templates/default/planetdump.erb
+++ b/cookbooks/planet/templates/default/planetdump.erb
@@ -7,14 +7,14 @@ set -e
 
 # Get the name of the file and the expected pattern
 file="$1"
-pattern="^osm-([0-9]{4})-([0-9]{2}-[0-9]{2})\.dmp$"
+pattern="^osm-([0-9]{4})-([0-9]{2})-([0-9]{2})\.dmp$"
 
 # Give up now if the file isn't a database dump
 [[ $file =~ $pattern ]] || exit 0
 
 # Save the year and date from the file name
 year="${BASH_REMATCH[1]}"
-date="${year}-${BASH_REMATCH[2]}"
+date="${year:2:2}${BASH_REMATCH[2]}${BASH_REMATCH[3]}"
 
 # Check the lock
 if [ -f /tmp/planetdump.lock ]; then
@@ -26,12 +26,23 @@ if [ -f /tmp/planetdump.lock ]; then
     fi
 fi
 
+# Redirect this shell's output to a file. This is so that it
+# can be emailed later, since this script is run from incron
+# and incron doesn't yet support MAILTO like cron does. The
+# command below appears to work in bash as well as dash.
+logfile="/tmp/planetdump.log.$$"
+exec > $logfile 2>&1
+
 # Create Lock
 echo $$ > /tmp/planetdump.lock
 
 # Define cleanup function
 function cleanup {
     rm /tmp/planetdump.lock
+    # Send an email with the output, since incron doesn't yet
+    # support doing this in the incrontab.
+    /usr/bin/mailx -s "Planet dump output: ${file}" zerebubuth@gmail.com < $logfile
+    rm $logfile
 }
 
 # Remove lock on exit
@@ -49,19 +60,31 @@ rm -rf relations relation_tags relation_members
 
 # Run the dump
 time nice -n 19 /opt/planet-dump-ng/planet-dump-ng \
-     -c "pbzip2 -c" -f "${file}" --dense-nodes=1 \
+     -c "pbzip2 -c" -f "/store/backup/${file}" --dense-nodes=1 \
      -C "changesets-${date}.osm.bz2" \
      -x "planet-${date}.osm.bz2" -X "history-${date}.osm.bz2" \
      -p "planet-${date}.osm.pbf" -P "history-${date}.osm.pbf"
 
-# Move XML dumps into place
-<% {
-    "changesets-${date}.osm.bz2" => "#{node[:planet][:dump][:xml_directory]}/${year}",
-    "planet-${date}.osm.bz2" => "#{node[:planet][:dump][:xml_directory]}/${year}",
-    "history-${date}.osm.bz2" => "#{node[:planet][:dump][:xml_history_directory]}/${year}",
-    "planet-${date}.osm.pbf" => node[:planet][:dump][:pbf_directory],
-    "history-${date}.osm.pbf" => node[:planet][:dump][:pbf_history_directory]
-}.each do |file,dir| -%>
-md5sum "<%= file %>" > "<%= file %>.md5"
-mv "<%= file %>" "<%= file %>.md5" "<%= dir %>"
-<% end -%>
+# Function to install a dump in place
+function install_dump {
+  type="$1"
+  format="$2"
+  dir="$3"
+  year="$4"
+  name="${type}-${date}.osm.${format}"
+  latest="${type}-latest.osm.${format}"
+
+  md5sum "${name}" > "${name}.md5"
+  mkdir -p "${dir}/${year}"
+  mv "${name}" "${name}.md5" "${dir}/${year}"
+  ln -sf "${year:-.}/${name}" "${dir}/${latest}"
+  rm -f "${dir}/${latest}.md5"
+  sed -e "s/${name}/${latest}/" "${dir}/${year}/${name}.md5" > "${dir}/${latest}.md5"
+}
+
+# Move dumps into place
+install_dump "changesets" "bz2" "<%= node[:planet][:dump][:xml_directory] %>" "${year}"
+install_dump "planet" "bz2" "<%= node[:planet][:dump][:xml_directory] %>" "${year}"
+install_dump "history" "bz2" "<%= node[:planet][:dump][:xml_history_directory] %>" "${year}"
+install_dump "planet" "pbf" "<%= node[:planet][:dump][:pbf_directory] %>"
+install_dump "history" "pbf" "<%= node[:planet][:dump][:pbf_history_directory] %>"