From d77e8c7fb6bd4f16feab014625b910ec007ef8f1 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 7 Mar 2018 11:20:03 +0100 Subject: [PATCH] also print cutoff times --- .../templates/backup_server/postgres-make-base-backups.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 c60a541b9..7438bb905 100755 --- a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb +++ b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb @@ -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) -- 2.20.1