Skip to content

Speed up KUTTL tests by dropping backups #3982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 6, 2024
Merged

Speed up KUTTL tests by dropping backups #3982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f798b33
Speed up KUTTL tests by dropping backups
benjaminjb Aug 29, 2024
40c6969
Change a few tests to see if that speeds things up
benjaminjb Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions testing/kuttl/e2e/cluster-pause/files/00-cluster-created.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,6 @@ kind: PostgresCluster
metadata:
name: cluster-pause
status:
conditions:
- message: pgBackRest dedicated repository host is ready
reason: RepoHostReady
status: "True"
type: PGBackRestRepoHostReady
- message: pgBackRest replica create repo is ready for backups
reason: StanzaCreated
status: "True"
type: PGBackRestReplicaRepoReady
- message: pgBackRest replica creation is now possible
reason: RepoBackupComplete
status: "True"
type: PGBackRestReplicaCreate
instances:
- name: instance1
readyReplicas: 1
Expand Down
11 changes: 0 additions & 11 deletions testing/kuttl/e2e/cluster-pause/files/00-create-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,3 @@ spec:
resources:
requests:
storage: 1Gi
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec:
accessModes:
- "ReadWriteOnce"
resources:
requests:
storage: 1Gi
12 changes: 0 additions & 12 deletions testing/kuttl/e2e/cluster-pause/files/01-cluster-paused.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,6 @@ metadata:
name: cluster-pause
status:
conditions:
- message: pgBackRest dedicated repository host is ready
reason: RepoHostReady
status: "True"
type: PGBackRestRepoHostReady
- message: pgBackRest replica create repo is ready for backups
reason: StanzaCreated
status: "True"
type: PGBackRestReplicaRepoReady
- message: pgBackRest replica creation is now possible
reason: RepoBackupComplete
status: "True"
type: PGBackRestReplicaCreate
- message: No spec changes will be applied and no other statuses will be updated.
reason: Paused
status: "False"
Expand Down
13 changes: 0 additions & 13 deletions testing/kuttl/e2e/cluster-pause/files/02-cluster-resumed.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,6 @@ kind: PostgresCluster
metadata:
name: cluster-pause
status:
conditions:
- message: pgBackRest dedicated repository host is ready
reason: RepoHostReady
status: "True"
type: PGBackRestRepoHostReady
- message: pgBackRest replica create repo is ready for backups
reason: StanzaCreated
status: "True"
type: PGBackRestReplicaRepoReady
- message: pgBackRest replica creation is now possible
reason: RepoBackupComplete
status: "True"
type: PGBackRestReplicaCreate
instances:
- name: instance1
readyReplicas: 1
Expand Down
9 changes: 0 additions & 9 deletions testing/kuttl/e2e/cluster-start/files/00-cluster-created.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,6 @@ status:
replicas: 1
updatedReplicas: 1
---
apiVersion: batch/v1
kind: Job
metadata:
labels:
postgres-operator.crunchydata.com/cluster: cluster-start
postgres-operator.crunchydata.com/pgbackrest-backup: replica-create
status:
succeeded: 1
---
apiVersion: v1
kind: Service
metadata:
Expand Down
11 changes: 0 additions & 11 deletions testing/kuttl/e2e/cluster-start/files/00-create-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,3 @@ spec:
resources:
requests:
storage: 1Gi
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec:
accessModes:
- "ReadWriteOnce"
resources:
requests:
storage: 1Gi
6 changes: 0 additions & 6 deletions testing/kuttl/e2e/exporter-custom-queries/files/exporter-custom-queries-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ spec:
instances:
- name: instance1
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
monitoring:
pgmonitor:
exporter:
Expand Down
6 changes: 0 additions & 6 deletions testing/kuttl/e2e/exporter-no-tls/files/exporter-no-tls-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ spec:
instances:
- name: instance1
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
monitoring:
pgmonitor:
exporter: {}
6 changes: 0 additions & 6 deletions testing/kuttl/e2e/exporter-password-change/files/initial-postgrescluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ spec:
instances:
- name: instance1
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
monitoring:
pgmonitor:
exporter: {}
6 changes: 0 additions & 6 deletions testing/kuttl/e2e/exporter-tls/files/exporter-tls-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ spec:
instances:
- name: instance1
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
monitoring:
pgmonitor:
exporter:
Expand Down
11 changes: 0 additions & 11 deletions testing/kuttl/e2e/password-change/00--cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,3 @@ spec:
resources:
requests:
storage: 1Gi
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec:
accessModes:
- "ReadWriteOnce"
resources:
requests:
storage: 1Gi
6 changes: 0 additions & 6 deletions testing/kuttl/e2e/pgadmin/01--cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@ spec:
- name: instance1
replicas: 1
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
userInterface:
pgAdmin:
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
Expand Down
8 changes: 1 addition & 7 deletions testing/kuttl/e2e/pgbouncer/00--cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,8 @@ spec:
postgresVersion: ${KUTTL_PG_VERSION}
instances:
- name: instance1
replicas: 2
replicas: 1
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
proxy:
pgBouncer:
replicas: 1
Expand Down
6 changes: 3 additions & 3 deletions testing/kuttl/e2e/pgbouncer/00-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ metadata:
status:
instances:
- name: instance1
readyReplicas: 2
replicas: 2
updatedReplicas: 2
readyReplicas: 1
replicas: 1
updatedReplicas: 1
---
apiVersion: v1
kind: Service
Expand Down
11 changes: 0 additions & 11 deletions testing/kuttl/e2e/replica-read/00--cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,3 @@ spec:
requests:
storage: 1Gi
replicas: 2
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec:
accessModes:
- "ReadWriteOnce"
resources:
requests:
storage: 1Gi
12 changes: 0 additions & 12 deletions testing/kuttl/e2e/root-cert-ownership/00--cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@ spec:
- name: instance1
replicas: 1
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
---
apiVersion: postgres-operator.crunchydata.com/v1beta1
kind: PostgresCluster
Expand All @@ -27,9 +21,3 @@ spec:
- name: instance1
replicas: 1
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
6 changes: 0 additions & 6 deletions testing/kuttl/e2e/standalone-pgadmin-db-uri/files/00-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,3 @@ spec:
instances:
- name: instance1
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
6 changes: 0 additions & 6 deletions testing/kuttl/e2e/standalone-pgadmin/files/02-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,3 @@ spec:
instances:
- name: instance1
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
6 changes: 0 additions & 6 deletions testing/kuttl/e2e/standalone-pgadmin/files/04-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,3 @@ spec:
instances:
- name: instance1
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
6 changes: 0 additions & 6 deletions testing/kuttl/e2e/standalone-pgadmin/files/06-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,3 @@ spec:
instances:
- name: instance1
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
6 changes: 0 additions & 6 deletions testing/kuttl/e2e/standalone-pgadmin/files/11-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,3 @@ spec:
instances:
- name: instance1
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
6 changes: 0 additions & 6 deletions testing/kuttl/e2e/streaming-standby/01--primary-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,3 @@ spec:
instances:
- name: instance1
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
6 changes: 0 additions & 6 deletions testing/kuttl/e2e/streaming-standby/03--standby-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,3 @@ spec:
instances:
- name: instance1
dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
6 changes: 0 additions & 6 deletions testing/kuttl/e2e/switchover/01--cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,3 @@ spec:
instances:
- replicas: 2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the test run slower when backups are off and replicas > 1?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question, I see four tests that have replicas and need them, so I'm testing them out:

  • replica-read
    • w/ backups: ~28s
    • w/o backups:~25s
  • scaledown
    • w/ backups: ~2m
    • w/o backups:~3m
  • switchover
    • w/ backups: ~37s
    • w/o backups:~34s

So adding backups back to Scaledown files for now and testing.

dataVolumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec: { accessModes: [ReadWriteOnce], resources: { requests: { storage: 1Gi } } }
11 changes: 0 additions & 11 deletions testing/kuttl/e2e/tablespace-enabled/00--cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,3 @@ spec:
resources:
requests:
storage: 1Gi
backups:
pgbackrest:
repos:
- name: repo1
volume:
volumeClaimSpec:
accessModes:
- "ReadWriteOnce"
resources:
requests:
storage: 1Gi
9 changes: 0 additions & 9 deletions testing/kuttl/e2e/tablespace-enabled/00-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,6 @@ status:
replicas: 1
updatedReplicas: 1
---
apiVersion: batch/v1
kind: Job
metadata:
labels:
postgres-operator.crunchydata.com/cluster: tablespace-enabled
postgres-operator.crunchydata.com/pgbackrest-backup: replica-create
status:
succeeded: 1
---
apiVersion: v1
kind: Service
metadata:
Expand Down
Loading