X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostgres%2Ftemplates%2Fbackup_server%2Fpostgres-make-base-backups.erb;h=023efd9c1434c4221ffd6266ea35b5f988e8d428;hb=b3c1a06e8efd0cb8d9eab1a6d2e6a38949015837;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..023efd9c1 100755
--- a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
+++ b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
@@ -58,7 +58,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
@@ -134,10 +134,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
@@ -164,10 +164,7 @@ bmdb1.debian.org	5435	debian-backup		main		9.6
 bmdb1.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