Merge pull request #96 from cybertec-postgresql/Improvements

Improvements

Author: Schmaetz

runit/patroni/run

@@ -21,7 +21,7 @@ fi
 ulimit -c unlimited
 
 # Only small subset of environment variables is allowed. We don't want accidentally disclose sensitive information
-for E in $(printenv -0 | tr '\n' ' ' | sed 's/\x00/\n/g' | grep -vE '^(KUBERNETES_(SERVICE|PORT|ROLE)[_=]|((POD_(IP|NAMESPACE))|HOSTNAME|PATH|PGHOME|LC_ALL|ENABLE_PG_MON|LD_PRELOAD|NSS_WRAPPER_PASSWD|NSS_WRAPPER_GROUP)=)' | sed 's/=.*//g'); do
+for E in $(printenv -0 | tr '\n' ' ' | sed 's/\x00/\n/g' | grep -vE '^(KUBERNETES_(SERVICE|PORT|ROLE)[_=]|((POD_(IP|NAMESPACE))|HOSTNAME|PATH|RW_DIR|PGHOME|LC_ALL|ENABLE_PG_MON|LD_PRELOAD|NSS_WRAPPER_PASSWD|NSS_WRAPPER_GROUP)=)' | sed 's/=.*//g'); do
     unset $E
 done
 

scripts/postgres/stanza_upgrade.sh

@@ -28,12 +28,23 @@ if [ "$pg_version" != "$stanza_version" ]; then
   echo "INFO: stanza version matches another PostgreSQL version: A stanza upgrade is required to ensure that pgBackRest can work with the current version of PostgreSQL"
   if pgbackrest stanza-upgrade --stanza=db; then
     echo "INFO: stanza has been successfully updated. New Version: $pg_version. Creating a new backup ... "
-    if pgbackrest backup --stanza=db --type=full --repo=1; then
-      echo "INFO: Backup created successfully."
+    pgbackrest backup --stanza=db --type=full --repo=1 > /dev/null 2>&1 &
+    BACKUP_PID=$!
+    sleep 5s 
+    if kill -0 $BACKUP_PID 2>/dev/null; then
+      echo "INFO: Backup started successfully."
+      disown $BACKUP_PID
       exit 0
     else
-      echo "ERROR: Backup failed!"
-      exit 1
+      wait $BACKUP_PID
+      EXIT_CODE=$?
+      if [ $EXIT_CODE -eq 0 ]; then
+          exit 0
+      else
+          echo "ERROR: Backup could not be started successfully!"
+          tail -n 10 "$PGHOME/pgdata/pgbackrest/log/db-backup.log"
+          exit 1
+      fi
     fi
   else
     echo "ERROR: stanza upgrade failed!"