marco/plugin-barman-cloud
1
0
Fork 0
mirror of https://github.com/cloudnative-pg/plugin-barman-cloud.git synced 2026-07-06 17:52:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

test: remove redundant primary/standby picking logic

Browse Source 
If pod-1 is not the primary we'd fail anyway because a timeline
bump would make all assertions about the walLogDir fail.
Also there's no reason why there should have been a switchover,
so we should not hide a failure if that happens.

Signed-off-by: Niccolò Fei <niccolo.fei@enterprisedb.com>
This commit is contained in:
Niccolò Fei 2026-06-23 18:45:12 +02:00 committed by Tao Li
parent 1b383e0e20
commit 16bc55f67e
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/internal/tests/walrestore/walrestore.go
View File

@ -59,7 +59,7 @@ const (
managerExecutable = "/controller/manager" managerExecutable = "/controller/manager"
// postgresContainer is the container we exec into on instance pods. // postgresContainer is the container we exec into on instance pods.
postgresContainer = "postgres" postgresContainer = "postgres"
// walLogDir is the wals sub-directory (timeline + log id) the forged segments // walLogDir is the WALs subdirectory (timeline + log id) the forged segments
// live under; a freshly bootstrapped, idle cluster stays within it. // live under; a freshly bootstrapped, idle cluster stays within it.
walLogDir = "0000000100000000" walLogDir = "0000000100000000"
// bucket is the destination bucket of the minio ObjectStore. // bucket is the destination bucket of the minio ObjectStore.
@ -105,7 +105,7 @@ func execInPod(
// This test drives the plugin's parallel WAL restore directly: it invokes the // This test drives the plugin's parallel WAL restore directly: it invokes the
// instance-manager wal-restore command on the standby (which delegates to the // instance-manager wal-restore command on the standby (which delegates to the
// plugin) and asserts the prefetch/spool/end-of-wal-stream state machine with // plugin) and asserts the prefetch/spool/end-of-wal-stream state machine with
// maxParallel = 3. To control the archive deterministically it forges WAL // maxParallel = 3. To control the archive deterministically, it forges WAL
// segments on the object store by copying a real archived segment under new // segments on the object store by copying a real archived segment under new
// names. // names.
var _ = Describe("Parallel WAL restore", func() { var _ = Describe("Parallel WAL restore", func() {
@ -166,9 +166,6 @@ var _ = Describe("Parallel WAL restore", func() {
primary := cluster.Status.CurrentPrimary primary := cluster.Status.CurrentPrimary
Expect(primary).NotTo(BeEmpty()) Expect(primary).NotTo(BeEmpty())
standby := clusterName + "-2" standby := clusterName + "-2"
if primary == standby {
standby = clusterName + "-1"
}
var s3ClientPods corev1.PodList var s3ClientPods corev1.PodList
Expect(cl.List(ctx, &s3ClientPods, Expect(cl.List(ctx, &s3ClientPods,