also print cutoff times
authorPeter Palfrader <peter@palfrader.org>
Wed, 7 Mar 2018 10:20:03 +0000 (11:20 +0100)
committerPeter Palfrader <peter@palfrader.org>
Wed, 7 Mar 2018 10:20:03 +0000 (11:20 +0100)
modules/postgres/templates/backup_server/postgres-make-base-backups.erb

index c60a541..7438bb9 100755 (executable)
@@ -112,7 +112,7 @@ while read host port username  cluster version; do
             delta=$(( now - mtime ))
             if [ "$delta" -lt "$MIN_WAIT" ]; then
                 runme=0
-                log "Skipping $host:$port $version/$cluster because last attempt was only $(format_timedelta "${delta}") ago."
+                log "Skipping $host:$port $version/$cluster because last attempt was only $(format_timedelta "${delta}") (< $(format_timedelta "${MIN_WAIT}")) ago."
             else
                 if ! [ -e "$flagfilesuccess" ]; then
                     runme=1
@@ -122,10 +122,10 @@ while read host port username  cluster version; do
                     delta=$(( now - mtime ))
                     if [ "$delta" -lt "$MIN_WAIT_SUCCESS" ]; then
                         runme=0
-                        log "Skipping $host:$port $version/$cluster because last success was only $(format_timedelta "${delta}") ago."
+                        log "Skipping $host:$port $version/$cluster because last success was only $(format_timedelta "${delta}") (< $(format_timedelta "${MIN_WAIT_SUCCESS}")) ago."
                     elif [ "$delta" -gt "$MAX_WAIT_SUCCESS" ]; then
                         runme=1
-                        log "Planning to run $host:$port $version/$cluster because last success was $(format_timedelta "${delta}") ago."
+                        log "Planning to run $host:$port $version/$cluster because last success was $(format_timedelta "${delta}") (>= $(format_timedelta "${MAX_WAIT_SUCCESS}")) ago."
                     else
                         # get a "randomish" but stable value for this backup run
                         val=$(echo "$MYHOSTNAME-$host-$port-$mtime" | sha256sum | head -c 8)