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

test: tighten WAL restore assertions and fix a misleading comment

Browse Source 
Assert the actual exit code on the end-of-wal-stream fast-fail path
instead of just HaveOccurred(), which would pass for any error. Also
correct a comment claiming ExecuteInContainer folds command output
into the returned error; it only carries the exit code, so forging a
WAL segment fails with no indication of the underlying aws CLI error.
Drop an unnecessary var declaration and note the real bound on the
forged segment numbering.

Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
This commit is contained in:
Marco Nenciarini 2026-07-09 09:14:38 +02:00
parent 9b2097f2b6
commit 2518deff63
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@ package walrestore
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"strconv" "strconv"
"strings" "strings"
@ -30,6 +31,7 @@ import (
apitypes "k8s.io/apimachinery/pkg/types" apitypes "k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
executil "k8s.io/client-go/util/exec"
"sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client"
internalClient "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/client" internalClient "github.com/cloudnative-pg/plugin-barman-cloud/test/e2e/internal/client"
@ -67,9 +69,8 @@ const (
) )
// walFile returns the name of the n-th forged WAL segment (segment 0xF0+n on // walFile returns the name of the n-th forged WAL segment (segment 0xF0+n on
// timeline 1, log 0). The high segment number keeps it out of the range an idle // timeline 1, log 0, for n <= 15). The high segment number keeps it out of the
// PostgreSQL would archive on its own. Hex formatting keeps the name a valid // range an idle PostgreSQL would archive on its own.
// 24-character segment for any small n.
func walFile(n int) string { func walFile(n int) string {
return fmt.Sprintf("0000000100000000%08X", 0xF0+n) return fmt.Sprintf("0000000100000000%08X", 0xF0+n)
} }
@ -199,8 +200,8 @@ var _ = Describe("Parallel WAL restore", func() {
"sh", "-c", "rm -f "+spoolDirectory+"/* 2>/dev/null; true") "sh", "-c", "rm -f "+spoolDirectory+"/* 2>/dev/null; true")
} }
forge := func(src, dst string) { forge := func(src, dst string) {
// ExecuteInContainer folds a non-zero exit (and its output) into the // ExecuteInContainer drops stdout/stderr on a non-zero exit, so on
// returned error, so we surface that rather than the empty stderr. // failure this only reports the exit code, not the aws CLI's error text.
_, _, err := execInPod(ctx, clientSet, cfg, ns, s3Client, s3ClientName, _, _, err := execInPod(ctx, clientSet, cfg, ns, s3Client, s3ClientName,
"aws", "s3", "cp", walObjectURI(src), walObjectURI(dst)) "aws", "s3", "cp", walObjectURI(src), walObjectURI(dst))
Expect(err).NotTo(HaveOccurred(), "forging %s -> %s", src, dst) Expect(err).NotTo(HaveOccurred(), "forging %s -> %s", src, dst)
@ -211,7 +212,6 @@ var _ = Describe("Parallel WAL restore", func() {
return err == nil && strings.TrimSpace(out) != "" return err == nil && strings.TrimSpace(out) != ""
} }
var latestWAL string
By("archiving a real WAL on the primary and learning its name") By("archiving a real WAL on the primary and learning its name")
_, _, err := execInPod(ctx, clientSet, cfg, ns, primary, postgresContainer, _, _, err := execInPod(ctx, clientSet, cfg, ns, primary, postgresContainer,
"psql", "-tAc", "CHECKPOINT") "psql", "-tAc", "CHECKPOINT")
@ -219,7 +219,7 @@ var _ = Describe("Parallel WAL restore", func() {
out, _, err := execInPod(ctx, clientSet, cfg, ns, primary, postgresContainer, out, _, err := execInPod(ctx, clientSet, cfg, ns, primary, postgresContainer,
"psql", "-tAc", "SELECT pg_walfile_name(pg_switch_wal())") "psql", "-tAc", "SELECT pg_walfile_name(pg_switch_wal())")
Expect(err).NotTo(HaveOccurred(), "switching WAL on the primary failed") Expect(err).NotTo(HaveOccurred(), "switching WAL on the primary failed")
latestWAL = strings.TrimSpace(out) latestWAL := strings.TrimSpace(out)
Expect(latestWAL).To(HavePrefix(walLogDir), Expect(latestWAL).To(HavePrefix(walLogDir),
"the freshly bootstrapped cluster should still be on the first WAL log") "the freshly bootstrapped cluster should still be on the first WAL log")
@ -288,7 +288,11 @@ var _ = Describe("Parallel WAL restore", func() {
// #6 (first): flag is set, so the request fails fast (exit 1) and the // #6 (first): flag is set, so the request fails fast (exit 1) and the
// flag is consumed, leaving an empty spool. // flag is consumed, leaving an empty spool.
By("requesting WAL #6: fails fast on the end-of-wal-stream flag, spool cleared") By("requesting WAL #6: fails fast on the end-of-wal-stream flag, spool cleared")
Expect(restore(walFile(6))).To(HaveOccurred(), "exit code should be 1") restoreErr := restore(walFile(6))
var exitErr executil.CodeExitError
Expect(errors.As(restoreErr, &exitErr)).To(BeTrue(),
"expected a CodeExitError, got %T: %v", restoreErr, restoreErr)
Expect(exitErr.ExitStatus()).To(Equal(1), "exit code should be 1")
Eventually(func(g Gomega) { Eventually(func(g Gomega) {
g.Expect(existsIn(pgWalPath, walFile(6))).To(BeFalse(), "#6 not restored") g.Expect(existsIn(pgWalPath, walFile(6))).To(BeFalse(), "#6 not restored")
g.Expect(spoolSegments()).To(Equal(0), "no WAL segments in spool") g.Expect(spoolSegments()).To(Equal(0), "no WAL segments in spool")