fix

egegunes · egegunes · commit 6886583eb298 · 2025-04-07T21:53:39.000+03:00
diff --git a/e2e-tests/tests/major-upgrade/01-create-cluster.yaml b/e2e-tests/tests/major-upgrade/01-create-cluster.yaml
@@ -13,6 +13,7 @@ commands:
           .spec.postgresVersion = 13 |
           .spec.image = "perconalab/percona-postgresql-operator:main-ppg13-postgres" |
           .spec.instances[0].dataVolumeClaimSpec.resources.requests.storage = "3Gi" |
+          .spec.patroni.createReplicaMethods = ["basebackup","pgbackrest"] |
           .spec.proxy.pgBouncer.image = "perconalab/percona-postgresql-operator:main-ppg13-pgbouncer" |
           .spec.backups.pgbackrest.image = "perconalab/percona-postgresql-operator:main-ppg13-pgbackrest"' \
         | kubectl -n "${NAMESPACE}" apply -f -
diff --git a/e2e-tests/tests/major-upgrade/21-wait-and-write-data.yaml b/e2e-tests/tests/major-upgrade/21-wait-and-write-data.yaml
@@ -19,6 +19,6 @@ commands:
       done
 
       run_psql_local \
-        '\c myapp \\\ INSERT INTO myApp (id) VALUES (100502)' \
+        '\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)"
 
diff --git a/e2e-tests/tests/major-upgrade/28-run-restore.yaml b/e2e-tests/tests/major-upgrade/28-run-restore.yaml
@@ -1,21 +1,7 @@
-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
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGRestore
+metadata:
+  name: restore-after-13-to-14
+spec:
+  pgCluster: major-upgrade
+  repoName: repo1
diff --git a/e2e-tests/tests/major-upgrade/29-assert.yaml b/e2e-tests/tests/major-upgrade/29-assert.yaml
@@ -10,4 +10,3 @@ data:
   data: |2-
      100500
      100501
-     100502
diff --git a/e2e-tests/tests/major-upgrade/31-wait-and-write-data.yaml b/e2e-tests/tests/major-upgrade/31-wait-and-write-data.yaml
@@ -19,6 +19,6 @@ commands:
       done
 
       run_psql_local \
-        '\c myapp \\\ INSERT INTO myApp (id) VALUES (100503)' \
+        '\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)"
 
diff --git a/e2e-tests/tests/major-upgrade/38-run-restore.yaml b/e2e-tests/tests/major-upgrade/38-run-restore.yaml
@@ -1,21 +1,7 @@
-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
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGRestore
+metadata:
+  name: restore-after-14-to-15
+spec:
+  pgCluster: major-upgrade
+  repoName: repo1
diff --git a/e2e-tests/tests/major-upgrade/39-assert.yaml b/e2e-tests/tests/major-upgrade/39-assert.yaml
@@ -11,4 +11,3 @@ data:
      100500
      100501
      100502
-     100503
diff --git a/e2e-tests/tests/major-upgrade/41-wait-and-write-data.yaml b/e2e-tests/tests/major-upgrade/41-wait-and-write-data.yaml
@@ -19,6 +19,6 @@ commands:
       done
 
       run_psql_local \
-        '\c myapp \\\ INSERT INTO myApp (id) VALUES (100504)' \
+        '\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)"
 
diff --git a/e2e-tests/tests/major-upgrade/48-run-restore.yaml b/e2e-tests/tests/major-upgrade/48-run-restore.yaml
@@ -1,21 +1,7 @@
-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
+apiVersion: pgv2.percona.com/v2
+kind: PerconaPGRestore
+metadata:
+  name: restore-after-15-to-16
+spec:
+  pgCluster: major-upgrade
+  repoName: repo1
diff --git a/e2e-tests/tests/major-upgrade/49-assert.yaml b/e2e-tests/tests/major-upgrade/49-assert.yaml
@@ -12,4 +12,3 @@ data:
      100501
      100502
      100503
-     100504
diff --git a/e2e-tests/tests/major-upgrade/51-wait-and-write-data.yaml b/e2e-tests/tests/major-upgrade/51-wait-and-write-data.yaml
@@ -6,11 +6,19 @@ commands:
       set -o errexit
       set -o xtrace
 
-      sleep 30
+      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)"
+
diff --git a/e2e-tests/tests/major-upgrade/58-run-restore.yaml b/e2e-tests/tests/major-upgrade/58-run-restore.yaml
@@ -5,4 +5,3 @@ metadata:
 spec:
   pgCluster: major-upgrade
   repoName: repo1
-
diff --git a/e2e-tests/tests/major-upgrade/59-assert.yaml b/e2e-tests/tests/major-upgrade/59-assert.yaml
@@ -7,4 +7,9 @@ apiVersion: v1
 metadata:
   name: 49-read-from-primary
 data:
-  data: ' 100500'
+  data: |2-
+     100500
+     100501
+     100502
+     100503
+     100504

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,3 @@ data:`
`10`	`10`	`data: \|2-`
`11`	`11`	`100500`
`12`	`12`	`100501`
`13`		`- 100502`
Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,3 @@ data:`
`11`	`11`	`100500`
`12`	`12`	`100501`
`13`	`13`	`100502`
`14`		`- 100503`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,3 @@ data:`
`12`	`12`	`100501`
`13`	`13`	`100502`
`14`	`14`	`100503`
`15`		`- 100504`