readme

Author: matthias

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2022-2023 CYBERTEC PostgreSQL International GmbH
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Makefile

@@ -26,7 +26,7 @@ endif
 
 all: base pgbackrest postgres
 base: base
-pgbackrest: base pgbackrest
+pgbackrest: pgbackrest
 postgres: base postgres
 postgres-stage: postgres-stage
 

Readme.md

@@ -1,6 +1,6 @@
 # CYBERTEC-OS-Container: PostgreSQL-HA-Cluster based on Rocky-Linux
 
-<p>CYBERTEC-OS-Container is a Docker suite that combines PostgreSQL, Patroni and etcd to create HA-PostgreSQL clusters based on containers. This suite is also the imagebase for the CYBERTEC-OS operator.</p>
+<p>CYBERTEC-OS-Container is a Docker suite that combines PostgreSQL, Patroni and etcd to create HA-PostgreSQL clusters based on containers. This suite is also the imagebase for the CYBERTEC-pg-operator(cpo).</p>
 
 ## Documentation
 

scripts/pgbackrest/backup/start.sh

@@ -4,30 +4,47 @@
 # call Primary Pod and start basebackup
 count=0
 while true ; do
-    hostName=$(kubectl get pods -l cluster-name=acid-cluster-1,spilo-role=master -o go-template --template '{{range .items}}{{.metadata.name}} {{ break }}{{end}}')
-    if [ -z "$hostName" ]
-    then
+    hostName=$(kubectl get pods -l cluster-name=${SCOPE},spilo-role=master -o go-template --template '{{range .items}}{{.metadata.name}} {{ break }}{{end}}')
+    if [ -z "$hostName" ]; then
         sleep 5
         output_info "pgBackRest: waiting for primary-Pod"
+        ((count++))
+        if [ "$count" == 30 ]; then
+            output_error "pgBackRest: waiting for primary-Pod - Timeout - Skip Step"
+            skip=1
+            break
+        fi
     else
         break
     fi
 done
-output_info "pgBackRest: Detect Primary-Pod $hostName"
-while true ; do
-    unset error
-    kubectl exec $hostName -c postgres -- /bin/bash -c 'pgbackrest backup --type=full --stanza=db --repo=1' || { output_error "pgBackRest: Create basebackup failed"; error=true; }
-    if [ "$error" = true ]; then
-         sleep 5
-    else
-        break;
-    fi
-done
+count=0
+if [ "$skip" == 1 ]; then
+    output_error "pgBackRest: No primary pod found - prevent deadlock and start database"
+else
+    output_info "pgBackRest: Detect Primary-Pod $hostName"
+    while true ; do
+        unset error
+        kubectl exec $hostName -c postgres -- /bin/bash -c 'pgbackrest backup --type=full --stanza=db --repo=1' || { output_error "pgBackRest: Create basebackup failed"; error=true; }
+        if [ "$error" = true ]; then
+            if [ "$count" == 3 ]; then
+                output_error "pgBackRest: Basebackup could not be created. Abort init-script";
+                exit 0
+            else
+                ((count++))
+                sleep 5
+            fi   
+        else
+            break;
+        fi
+    done
+
+    output_info "pgBackRest: Update Restore-Configmap"
+    configmap="${SCOPE}-pgbackrest-restore"
+    kubectl get cm $configmap -o yaml | \
+    sed -e 's|restore_basebackup: "false"|restore_basebackup: "true"|' | \
+    kubectl apply -f -
 
-output_info "pgBackRest: Update Restore-Configmap"
-configmap="${SCOPE}-pgbackrest-restore"
-kubectl get cm $configmap -o yaml | \
-  sed -e 's|restore_basebackup: "false"|restore_basebackup: "true"|' | \
-  kubectl apply -f -
+    output_info "pgBackRest: Backup complete"
+fi
 
-output_info "pgBackRest: Backup complete"

scripts/pgbackrest/restore/start.sh

@@ -23,11 +23,11 @@ if [ -d "$pgroot/data_bootstrap" ]; then
 fi
 
 # Add Path
-restore_command="$restore_opts --stanza=db --pg1-path=$pgdata --delta --link-map=pg_wal=$pgroot/data_wal"
+restore_command="$restore_opts --stanza=db --pg1-path=$pgdata --delta --link-map=pg_wal=$pgroot/data_wal --target-action=promote"
 
 # Do Restore
 output_info "pgBackRest: start restore: Defined options: $restore_command"
-pgbackrest restore $restore_command || { output_error "pgBackRest: Restore failed"; exit 0; } #<< /home/postgres/pgdata/pgbackrest/log/restore-pod.log
+bash -xc "pgbackrest restore ${restore_command}" || { output_error "pgBackRest: Restore failed"; exit 0; } #<< /home/postgres/pgdata/pgbackrest/log/restore-pod.log
 output_info "Defined Data-DIR: $pgdata"
 # Check Restore
 until [ "${recovery=}" = 'f' ]; do

scripts/postgres/init_pgbackrest.sh

@@ -7,6 +7,12 @@ else
     mkdir -p /home/postgres/pgdata/pgbackrest/log
     echo "Created: Folder structure was created"
 fi
+if [ -d "/home/postgres/pgdata/pgbackrest/spool-path" ]; then
+    echo "Skip: Spool-Folder already exists ... "
+else
+    mkdir -p /home/postgres/pgdata/pgbackrest/spool-path
+    echo "Created: Spool-Folder was created"
+fi
 # Create Stanza and run Init-Backup
 stanza=$(pgbackrest info --output=json)
 if [ "$stanza" == "[]" ]; then