fixes

Author: egegunes

e2e-tests/tests/major-upgrade/01-assert.yaml

@@ -1,6 +1,6 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 120
+timeout: 240
 ---
 kind: StatefulSet
 apiVersion: apps/v1

e2e-tests/tests/major-upgrade/02-write-data.yaml

@@ -10,11 +10,11 @@ commands:
       run_psql_local \
         'CREATE DATABASE myapp; \c myapp \\\ CREATE TABLE IF NOT EXISTS myApp (id int PRIMARY KEY);' \
         "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)"
-      
+
       run_psql_local \
         '\c myapp \\\ INSERT INTO myApp (id) VALUES (100500)' \
         "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)"
 
       run_psql_local \
         '\c postgres \\\ CREATE EXTENSION pg_cron' \
-        "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)"
+        "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)"

e2e-tests/tests/major-upgrade/10-assert.yaml

@@ -1,6 +1,6 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 360
+timeout: 600
 commands:
 - script: |-
     kubectl -n ${NAMESPACE} get pg,pod,job

e2e-tests/tests/major-upgrade/41-wait.yaml e2e-tests/tests/major-upgrade/11-wait-and-write-data.yaml

@@ -6,11 +6,19 @@ commands:
       set -o errexit
       set -o xtrace
 
-      sleep 300
+      source ../../functions
+
+      sleep 90 # wait some time for stanza to upgrade
 
       for pod in $(kubectl -n ${NAMESPACE} get pods -l postgres-operator.crunchydata.com/data=postgres --no-headers | awk '{print $1}'); do
               echo "Checking the status of ${pod}:"
               kubectl -n ${NAMESPACE} exec -it ${pod} -- psql -c "SELECT version()"
               kubectl -n ${NAMESPACE} exec -it ${pod} -- psql -c "SELECT timeline_id FROM pg_control_checkpoint()"
               kubectl -n ${NAMESPACE} exec -it ${pod} -- pgbackrest --stanza=db --log-level-console=detail check
+              kubectl -n ${NAMESPACE} exec -it ${pod} -- ls -l /pgdata/pg13_wal/
       done
+
+      run_psql_local \
+        '\c myapp \\\ INSERT INTO myApp (id) VALUES (100501)' \
+        "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)"
+

e2e-tests/tests/major-upgrade/13-wait.yaml

@@ -3,7 +3,4 @@ kind: TestStep
 commands:
   - timeout: 600
     script: |-
-      set -o errexit
-      set -o xtrace
-
-      sleep 30
+      sleep 60

e2e-tests/tests/major-upgrade/18-run-restore.yaml

@@ -1,7 +1,22 @@
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGRestore
-metadata:
-  name: restore-after-12-to-13
-spec:
-  pgCluster: major-upgrade
-  repoName: repo1
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - timeout: 600
+    script: |-
+      set -o errexit
+      set -o xtrace
+
+      backup_name=$(kubectl -n ${NAMESPACE} get pg-backup backup-after-12-to-13 -o jsonpath={.status.backupName})
+
+      cat <<-EOF | kubectl -n ${NAMESPACE} apply -f -
+      apiVersion: pgv2.percona.com/v2
+      kind: PerconaPGRestore
+      metadata:
+        name: restore-after-12-to-13
+      spec:
+        pgCluster: major-upgrade
+        repoName: repo1
+        options:
+        - --set=${backup_name}
+      EOF

e2e-tests/tests/major-upgrade/19-assert.yaml

@@ -5,6 +5,8 @@ timeout: 30
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: 05-read-from-primary
+  name: 19-read-from-primary
 data:
-  data: ' 100500'
+  data: |2-
+    100500
+    100501

e2e-tests/tests/major-upgrade/19-read-from-primary.yaml

@@ -9,4 +9,4 @@ commands:
       source ../../functions
       data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)")
 
-      kubectl create configmap -n "${NAMESPACE}" 05-read-from-primary --from-literal=data="${data}"
+      kubectl create configmap -n "${NAMESPACE}" 19-read-from-primary --from-literal=data="${data}"

e2e-tests/tests/major-upgrade/31-wait.yaml e2e-tests/tests/major-upgrade/21-wait-and-write-data.yaml

@@ -6,11 +6,19 @@ commands:
       set -o errexit
       set -o xtrace
 
-      sleep 300
+      source ../../functions
+
+      sleep 90 # wait some time for stanza to upgrade
 
       for pod in $(kubectl -n ${NAMESPACE} get pods -l postgres-operator.crunchydata.com/data=postgres --no-headers | awk '{print $1}'); do
               echo "Checking the status of ${pod}:"
               kubectl -n ${NAMESPACE} exec -it ${pod} -- psql -c "SELECT version()"
               kubectl -n ${NAMESPACE} exec -it ${pod} -- psql -c "SELECT timeline_id FROM pg_control_checkpoint()"
               kubectl -n ${NAMESPACE} exec -it ${pod} -- pgbackrest --stanza=db --log-level-console=detail check
+              kubectl -n ${NAMESPACE} exec -it ${pod} -- ls -l /pgdata/pg14_wal
       done
+
+      run_psql_local \
+        '\c myapp \\\ INSERT INTO myApp (id) VALUES (100502)' \
+        "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)"
+

e2e-tests/tests/major-upgrade/23-wait.yaml

@@ -3,4 +3,4 @@ kind: TestStep
 commands:
   - timeout: 600
     script: |-
-      sleep 30
+      sleep 60

e2e-tests/tests/major-upgrade/28-run-restore.yaml

@@ -1,7 +1,21 @@
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGRestore
-metadata:
-  name: restore-after-13-to-14
-spec:
-  pgCluster: major-upgrade
-  repoName: repo1
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - timeout: 600
+    script: |-
+      set -o errexit
+      set -o xtrace
+
+      backup_name=$(kubectl -n ${NAMESPACE} get pg-backup backup-after-13-to-14 -o jsonpath={.status.backupName})
+
+      cat <<-EOF | kubectl -n ${NAMESPACE} apply -f -
+      apiVersion: pgv2.percona.com/v2
+      kind: PerconaPGRestore
+      metadata:
+        name: restore-after-13-to-14
+      spec:
+        pgCluster: major-upgrade
+        repoName: repo1
+        options:
+        - --set=${backup_name}
+      EOF

e2e-tests/tests/major-upgrade/29-assert.yaml

@@ -5,6 +5,9 @@ timeout: 30
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: 07-read-from-primary
+  name: 29-read-from-primary
 data:
-  data: ' 100500'
+  data: |2-
+    100500
+    100501
+    100502

e2e-tests/tests/major-upgrade/29-read-from-primary.yaml

@@ -9,4 +9,4 @@ commands:
       source ../../functions
       data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)")
 
-      kubectl create configmap -n "${NAMESPACE}" 07-read-from-primary --from-literal=data="${data}"
+      kubectl create configmap -n "${NAMESPACE}" 29-read-from-primary --from-literal=data="${data}"

e2e-tests/tests/major-upgrade/30-assert.yaml

@@ -32,7 +32,7 @@ metadata:
     postgres-operator.crunchydata.com/cluster: major-upgrade
     postgres-operator.crunchydata.com/pgbackrest: ''
     postgres-operator.crunchydata.com/pgbackrest-backup: replica-create
-    postgres-operator.crunchydata.com/pgbackrest-repo: repo3
+    postgres-operator.crunchydata.com/pgbackrest-repo: repo1
   ownerReferences:
     - apiVersion: pgv2.percona.com/v2
       kind: PerconaPGBackup

e2e-tests/tests/major-upgrade/11-wait.yaml e2e-tests/tests/major-upgrade/31-wait-and-write-data.yaml

@@ -6,11 +6,19 @@ commands:
       set -o errexit
       set -o xtrace
 
-      sleep 300
+      source ../../functions
+
+      sleep 90
 
       for pod in $(kubectl -n ${NAMESPACE} get pods -l postgres-operator.crunchydata.com/data=postgres --no-headers | awk '{print $1}'); do
               echo "Checking the status of ${pod}:"
               kubectl -n ${NAMESPACE} exec -it ${pod} -- psql -c "SELECT version()"
               kubectl -n ${NAMESPACE} exec -it ${pod} -- psql -c "SELECT timeline_id FROM pg_control_checkpoint()"
               kubectl -n ${NAMESPACE} exec -it ${pod} -- pgbackrest --stanza=db --log-level-console=detail check
+              kubectl -n ${NAMESPACE} exec -it ${pod} -- ls -l /pgdata/pg15_wal
       done
+
+      run_psql_local \
+        '\c myapp \\\ INSERT INTO myApp (id) VALUES (100503)' \
+        "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)"
+

e2e-tests/tests/major-upgrade/33-wait.yaml

@@ -3,4 +3,4 @@ kind: TestStep
 commands:
   - timeout: 600
     script: |-
-      sleep 30
+      sleep 60

e2e-tests/tests/major-upgrade/38-run-restore.yaml

@@ -1,8 +1,21 @@
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGRestore
-metadata:
-  name: restore-after-14-to-15
-spec:
-  pgCluster: major-upgrade
-  repoName: repo1
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - timeout: 600
+    script: |-
+      set -o errexit
+      set -o xtrace
 
+      backup_name=$(kubectl -n ${NAMESPACE} get pg-backup backup-after-14-to-15 -o jsonpath={.status.backupName})
+
+      cat <<-EOF | kubectl -n ${NAMESPACE} apply -f -
+      apiVersion: pgv2.percona.com/v2
+      kind: PerconaPGRestore
+      metadata:
+        name: restore-after-14-to-15
+      spec:
+        pgCluster: major-upgrade
+        repoName: repo1
+        options:
+        - --set=${backup_name}
+      EOF

e2e-tests/tests/major-upgrade/39-assert.yaml

@@ -5,6 +5,10 @@ timeout: 30
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: 09-read-from-primary
+  name: 39-read-from-primary
 data:
-  data: ' 100500'
+  data: |2-
+    100500
+    100501
+    100502
+    100503

e2e-tests/tests/major-upgrade/39-read-from-primary.yaml

@@ -9,4 +9,4 @@ commands:
       source ../../functions
       data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)")
 
-      kubectl create configmap -n "${NAMESPACE}" 09-read-from-primary --from-literal=data="${data}"
+      kubectl create configmap -n "${NAMESPACE}" 39-read-from-primary --from-literal=data="${data}"

e2e-tests/tests/major-upgrade/21-wait.yaml e2e-tests/tests/major-upgrade/41-wait-and-write-data.yaml

@@ -6,11 +6,19 @@ commands:
       set -o errexit
       set -o xtrace
 
-      sleep 300
+      source ../../functions
+
+      sleep 90
 
       for pod in $(kubectl -n ${NAMESPACE} get pods -l postgres-operator.crunchydata.com/data=postgres --no-headers | awk '{print $1}'); do
               echo "Checking the status of ${pod}:"
               kubectl -n ${NAMESPACE} exec -it ${pod} -- psql -c "SELECT version()"
               kubectl -n ${NAMESPACE} exec -it ${pod} -- psql -c "SELECT timeline_id FROM pg_control_checkpoint()"
               kubectl -n ${NAMESPACE} exec -it ${pod} -- pgbackrest --stanza=db --log-level-console=detail check
+              kubectl -n ${NAMESPACE} exec -it ${pod} -- ls -l /pgdata/pg16_wal
       done
+
+      run_psql_local \
+        '\c myapp \\\ INSERT INTO myApp (id) VALUES (100504)' \
+        "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)"
+

e2e-tests/tests/major-upgrade/43-wait.yaml

@@ -3,4 +3,4 @@ kind: TestStep
 commands:
   - timeout: 600
     script: |-
-      sleep 30
+      sleep 60

e2e-tests/tests/major-upgrade/48-run-restore.yaml

@@ -1,8 +1,21 @@
-apiVersion: pgv2.percona.com/v2
-kind: PerconaPGRestore
-metadata:
-  name: restore-after-15-to-16
-spec:
-  pgCluster: major-upgrade
-  repoName: repo1
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - timeout: 600
+    script: |-
+      set -o errexit
+      set -o xtrace
 
+      backup_name=$(kubectl -n ${NAMESPACE} get pg-backup backup-after-15-to-16 -o jsonpath={.status.backupName})
+
+      cat <<-EOF | kubectl -n ${NAMESPACE} apply -f -
+      apiVersion: pgv2.percona.com/v2
+      kind: PerconaPGRestore
+      metadata:
+        name: restore-after-15-to-16
+      spec:
+        pgCluster: major-upgrade
+        repoName: repo1
+        options:
+        - --set=${backup_name}
+      EOF

e2e-tests/tests/major-upgrade/49-assert.yaml

@@ -5,6 +5,11 @@ timeout: 30
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: 11-read-from-primary
+  name: 49-read-from-primary
 data:
-  data: ' 100500'
+  data: |2-
+    100500
+    100501
+    100502
+    100503
+    100504

e2e-tests/tests/major-upgrade/49-read-from-primary.yaml

@@ -9,4 +9,4 @@ commands:
       source ../../functions
       data=$(run_psql_local '\c myapp \\\ SELECT * from myApp;' "postgres:$(get_psql_user_pass major-upgrade-pguser-postgres)@$(get_psql_user_host major-upgrade-pguser-postgres)")
 
-      kubectl create configmap -n "${NAMESPACE}" 11-read-from-primary --from-literal=data="${data}"
+      kubectl create configmap -n "${NAMESPACE}" 49-read-from-primary --from-literal=data="${data}"