X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostgres%2Ftemplates%2Fbackup_server%2Fpostgres-make-base-backups.erb;h=f9381f1523cfa0ed5380e95f30e73d6de7c50a8f;hb=01d7face6862a6c5df558e6cb238fe6833d5bc4a;hp=3d9e7ed0b9dfc92a1da3ca56d2b960eae96e7559;hpb=85f1c5ad5221e240a97579b3398ded06ecc8e7d1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
index 3d9e7ed0b..f9381f152 100755
--- a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
+++ b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
@@ -41,6 +41,11 @@ STATEDIR=/var/lib/dsa/postgres-make-base-backups
 ####
 set -u
 
+if [ "$(id -u)" = 0 ]; then
+    echo >&2 "Do not run me as root.  Probably you want sudo -u debbackup."
+    exit 1
+fi
+
 SELF="`basename "$0"`[$$]"
 DELTA_WAIT_SUCCESS=$(( MAX_WAIT_SUCCESS - MIN_WAIT_SUCCESS ))
 MYHOSTNAME=$(hostname -f)
@@ -58,7 +63,7 @@ log() {
 format_timedelta() {
     local secs="$1"; shift
     if [ "$secs" -ge 86400 ]; then
-        printf '%dd %02d:%02d:%02d\n' $(($secs/3600/24)) $(($secs/3600%24)) $(($secs/60%60)) $(($secs%60))
+        printf '%d+%02d:%02d:%02d\n' $(($secs/3600/24)) $(($secs/3600%24)) $(($secs/60%60)) $(($secs%60))
     else
         printf '%02d:%02d:%02d\n' $(($secs/3600)) $(($secs/60%60)) $(($secs%60))
     fi
@@ -96,7 +101,7 @@ while read host port username  cluster version; do
     flagfilesuccess="$STATEDIR/$host-$port.last-success"
     if [ -n "$forcehostport" ]; then
         if [ "$forcehostport" != "$host:$port" ]; then
-            log "Skipping $host:$port $version/$cluster because this run is limited to $host:$port."
+            log "Skipping $host:$port $version/$cluster because this run is limited to $forcehostport."
             runme=0
         else
             log "Forcing $host:$port $version/$cluster run."
@@ -134,10 +139,10 @@ while read host port username  cluster version; do
                         age_after_min=$((delta - MIN_WAIT_SUCCESS))
                         if [ "$age_after_min" -lt "$rnd_cuttoff" ]; then
                             runme=0
-                            log "Skipping $host:$port $version/$cluster because random computer says wait ($age_after_min < $rnd_cuttoff)."
+                            log "Skipping $host:$port $version/$cluster because random computer says wait ([$(format_timedelta "${age_after_min}") < $(format_timedelta "${rnd_cuttoff}") (< $(format_timedelta "${DELTA_WAIT_SUCCESS}"))] + $(format_timedelta "${MIN_WAIT_SUCCESS}"))."
                         else
                             runme=1
-                            log "Planning to run $host:$port $version/$cluster because random computer says so ($age_after_min >= $rnd_cuttoff)."
+                            log "Planning to run $host:$port $version/$cluster because random computer says so ($(format_timedelta "${age_after_min}") >= $(format_timedelta "${rnd_cuttoff}"))."
                         fi
                     fi
                 fi
@@ -152,6 +157,7 @@ while read host port username  cluster version; do
             log "Running $host:$port $version/$cluster."
             /usr/local/bin/postgres-make-one-base-backup "$host" "$port" "$username" "$cluster" "$version"
             rc=$?
+            log "Base backup for $host:$port $version/$cluster exited with rc $rc."
             [ "$rc" = 0 ] && touch "$flagfilesuccess"
             flock -u 201
         else
@@ -160,14 +166,12 @@ while read host port username  cluster version; do
     fi
 done << EOF
 seger.debian.org	5432	debian-backup		dak		9.6
+danzi.debian.org	5432	debian-backup		tracker 	9.6
 bmdb1.debian.org	5435	debian-backup		main		9.6
-bmdb1.debian.org	5436	debian-backup		wannabuild	9.6
+danzi.debian.org	5436	debian-backup		wannabuild	9.6
 bmdb1.debian.org	5440	debian-backup		debsources	9.6
 fasolo.debian.org	5433	debian-backup		dak		9.6
-sibelius.debian.org	5433	debian-backup		snapshot	9.4
-<%- if @hostname != "backuphost" -%>
-moszumanska.debian.org	5432	debian-backup		main		9.1
-<%- end -%>
+sallinen.debian.org	5473	debian-backup		snapshot	9.6
 #
 # puppet notice:  this is just a partial file.  The tail EOF comes
 # from a different concat fragment