From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 7 Mar 2018 10:21:07 +0000 (+0100)
Subject: postgres-make-base-backups: re-order logic for consistency
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=83978ebb51dcd06c7a4cc2bd7ebf0a42344fdbed;p=mirror%2Fdsa-puppet.git

postgres-make-base-backups: re-order logic for consistency
---

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 7438bb905..8b34f48d2 100755
--- a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
+++ b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
@@ -132,12 +132,12 @@ while read host port username  cluster version; do
                         val=$((16#$val))
                         valmod=$(($val % $DELTA_WAIT_SUCCESS))
                         after_min=$((delta - MIN_WAIT_SUCCESS))
-                        if [ "$after_min" -gt "$valmod" ]; then
-                            runme=1
-                            log "Planning to run $host:$port $version/$cluster because random computer says so ($after_min > $valmod)."
-                        else
+                        if [ "$after_min" -lt "$valmod" ]; then
                             runme=0
-                            log "Skipping $host:$port $version/$cluster because random computer says wait ($after_min <= $valmod)."
+                            log "Skipping $host:$port $version/$cluster because random computer says wait ($after_min < $valmod)."
+                        else
+                            runme=1
+                            log "Planning to run $host:$port $version/$cluster because random computer says so ($after_min >= $valmod)."
                         fi
                     fi
                 fi