fix: classify WAL restore errors with precise gRPC statuses by leonardoce · Pull Request #927 · cloudnative-pg/plugin-barman-cloud

leonardoce · 2026-05-27T09:04:04Z

Map each restorer sentinel to the gRPC status that best reflects whether the operator should retry:

ErrWALNotFound -> NotFound (terminal)
ErrInvalidWalName -> InvalidArgument (terminal)
ErrConnectivity -> Unavailable (retry)
ErrGeneric -> Unavailable (retry)
anything else -> Internal (terminal)

Previously every non-NotFound failure was returned verbatim, leaving the operator unable to tell transient blips apart from terminal conditions like a malformed WAL name.

leonardoce · 2026-05-27T09:48:17Z

This PR needs cloudnative-pg/barman-cloud#253

gbartolini · 2026-05-29T01:51:42Z

I have created this ticket in Barman Cloud: EnterpriseDB/barman#1193

gbartolini · 2026-05-29T01:57:01Z

I have created this ticket in Barman Cloud: EnterpriseDB/barman#1193

I have proposed this PR.

gbartolini · 2026-05-29T02:21:32Z

This PR needs cloudnative-pg/barman-cloud#253

Merged!

litaocdl · 2026-06-02T08:24:30Z

LGTM now

Map each restorer sentinel to the gRPC status that best reflects whether the operator should retry: - ErrWALNotFound -> NotFound (terminal) - ErrInvalidWalName -> InvalidArgument (terminal) - ErrConnectivity -> Unavailable (retry) - ErrGeneric -> Unavailable (retry) - anything else -> Internal (terminal) Previously every non-NotFound failure was returned verbatim, leaving the operator unable to tell transient blips apart from terminal conditions like a malformed WAL name. Signed-off-by: Leonardo Cecchi <leonardo.cecchi@enterprisedb.com>

The per-case and helper comments asserted what the operator will do with each gRPC code ("the operator stops retrying", "the operator will retry the request", etc.). On the current cloudnative-pg main, the operator only differentiates ErrWALNotFound; the precise-code distinctions become meaningful only after the operator-side retry work lands. Rewrite the comments to describe what the code emits and why (per gRPC convention), so they stay accurate regardless of the operator version on the other end. Also note that barman returns ErrGeneric (exit 4) for some retryable conditions too — not only ErrConnectivity (exit 2) — which justifies why both map to codes.Unavailable. Signed-off-by: Armando Ruocco <armando.ruocco@enterprisedb.com>

Extract the barman-restorer error -> gRPC code switch from restoreFromBarmanObjectStore into a pure helper, classifyWALRestoreError, so it can be exercised in isolation without the surrounding k8s client / configuration scaffolding. Add ginkgo specs that check: - each barman sentinel maps to the expected gRPC status code (ErrConnectivity and ErrGeneric both -> Unavailable, since barman uses exit 4 for some retryable conditions too), - an unclassified error falls through to codes.Internal, - classification still works through multiple fmt.Errorf wraps, - the switch matches by errors.Is identity rather than message substring (so a NotFound whose message happens to mention "connectivity" still maps to NotFound). internal/cnpgi/common had no tests before; this introduces the suite scaffolding alongside the new specs. Signed-off-by: Armando Ruocco <armando.ruocco@enterprisedb.com>

…s addition The replace directive in go.mod pulls in a barman-cloud version that exposes the new restoreAdditionalCommandArgs field on BarmanObjectStoreConfiguration. The plugin's CRD embeds that struct, so controller-gen + kustomize must be rerun to surface the field in the published CRD and bundled manifest. CI's uncommitted-changes guard caught the gap. Regenerated with controller-gen v0.21.0 (matching the daggerverse module version) and kustomize v5.5.0; only the new field is added, no annotation drift. Signed-off-by: Armando Ruocco <armando.ruocco@enterprisedb.com>

Signed-off-by: Tao Li <tao.li@enterprisedb.com>

…ud (v0.12.0 ➔ v0.13.0) (#10) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [cloudnative-pg/plugin-barman-cloud](https://github.com/cloudnative-pg/plugin-barman-cloud) | minor | `v0.12.0` → `v0.13.0` | --- ### Release Notes <details> <summary>cloudnative-pg/plugin-barman-cloud (cloudnative-pg/plugin-barman-cloud)</summary> ### [`v0.13.0`](https://github.com/cloudnative-pg/plugin-barman-cloud/releases/tag/v0.13.0) [Compare Source](cloudnative-pg/plugin-barman-cloud@v0.12.0...v0.13.0) ##### Features - Configure k8s recommended labels on subresources ([#865](cloudnative-pg/plugin-barman-cloud#865)) ([4bbaf18](cloudnative-pg/plugin-barman-cloud@4bbaf18)), closes [#545](cloudnative-pg/plugin-barman-cloud#545) - Pass additionalCommandArgs to barman-cloud-restore ([#914](cloudnative-pg/plugin-barman-cloud#914)) ([c5f149b](cloudnative-pg/plugin-barman-cloud@c5f149b)), closes [#821](cloudnative-pg/plugin-barman-cloud#821) ##### Bug Fixes - Add lz4 compression support for base backups ([#868](cloudnative-pg/plugin-barman-cloud#868)) ([e30154b](cloudnative-pg/plugin-barman-cloud@e30154b)), closes [#867](cloudnative-pg/plugin-barman-cloud#867) - Classify WAL restore errors with precise gRPC statuses ([#927](cloudnative-pg/plugin-barman-cloud#927)) ([aaf6120](cloudnative-pg/plugin-barman-cloud@aaf6120)) - **deps:** Update all non-major go dependencies ([#877](cloudnative-pg/plugin-barman-cloud#877)) ([a81f6e3](cloudnative-pg/plugin-barman-cloud@a81f6e3)) - **deps:** Update all non-major go dependencies ([#898](cloudnative-pg/plugin-barman-cloud#898)) ([acdbfb8](cloudnative-pg/plugin-barman-cloud@acdbfb8)) - **deps:** Update all non-major go dependencies to [`5d46599`](cloudnative-pg/plugin-barman-cloud@5d46599) ([#940](cloudnative-pg/plugin-barman-cloud#940)) ([40aa4b2](cloudnative-pg/plugin-barman-cloud@40aa4b2)) - **deps:** Update all non-major go dependencies to [`8e1642e`](cloudnative-pg/plugin-barman-cloud@8e1642e) ([#939](cloudnative-pg/plugin-barman-cloud#939)) ([f708825](cloudnative-pg/plugin-barman-cloud@f708825)) - **deps:** Update all non-major go dependencies to [`bd68198`](cloudnative-pg/plugin-barman-cloud@bd68198) ([#950](cloudnative-pg/plugin-barman-cloud#950)) ([787d2b3](cloudnative-pg/plugin-barman-cloud@787d2b3)) - **deps:** Update documentation dependencies to v3.10.1 ([#878](cloudnative-pg/plugin-barman-cloud#878)) ([6cf473d](cloudnative-pg/plugin-barman-cloud@6cf473d)) - **deps:** Update k8s.io/utils digest to [`ff6756f`](cloudnative-pg/plugin-barman-cloud@ff6756f) ([#894](cloudnative-pg/plugin-barman-cloud#894)) ([b7389e1](cloudnative-pg/plugin-barman-cloud@b7389e1)) - **deps:** Update kubernetes monorepo to v0.35.4 ([#853](cloudnative-pg/plugin-barman-cloud#853)) ([21f811a](cloudnative-pg/plugin-barman-cloud@21f811a)) - **deps:** Update kubernetes monorepo to v0.36.1 ([#909](cloudnative-pg/plugin-barman-cloud#909)) ([99eb4a3](cloudnative-pg/plugin-barman-cloud@99eb4a3)) - **deps:** Update module github.com/cloudnative-pg/cloudnative-pg to v1.29.1 \[security] ([#902](cloudnative-pg/plugin-barman-cloud#902)) ([ba5063f](cloudnative-pg/plugin-barman-cloud@ba5063f)) - **deps:** Update module github.com/cloudnative-pg/machinery to v0.5.0 ([#925](cloudnative-pg/plugin-barman-cloud#925)) ([ef4b711](cloudnative-pg/plugin-barman-cloud@ef4b711)) - **deps:** Update module github.com/onsi/ginkgo/v2 to v2.28.2 ([#874](cloudnative-pg/plugin-barman-cloud#874)) ([8cb32e5](cloudnative-pg/plugin-barman-cloud@8cb32e5)) - **deps:** Update module google.golang.org/grpc to v1.81.0 ([#884](cloudnative-pg/plugin-barman-cloud#884)) ([6fdecfd](cloudnative-pg/plugin-barman-cloud@6fdecfd)) - **deps:** Update module sigs.k8s.io/controller-runtime to v0.24.0 ([#880](cloudnative-pg/plugin-barman-cloud#880)) ([58f4fed](cloudnative-pg/plugin-barman-cloud@58f4fed)) - **deps:** Update module sigs.k8s.io/controller-runtime to v0.24.1 ([#910](cloudnative-pg/plugin-barman-cloud#910)) ([9be87b0](cloudnative-pg/plugin-barman-cloud@9be87b0)) - **docs:** Update broken link to CloudNativePG documentation ([#904](cloudnative-pg/plugin-barman-cloud#904)) ([43f92fb](cloudnative-pg/plugin-barman-cloud@43f92fb)), closes [#729](cloudnative-pg/plugin-barman-cloud#729) - **scheme:** Register meta types for CNPG scheme group version ([#943](cloudnative-pg/plugin-barman-cloud#943)) ([bb7845d](cloudnative-pg/plugin-barman-cloud@bb7845d)), closes [#942](cloudnative-pg/plugin-barman-cloud#942) </details> --- ### Configuration 📅 **Schedule**: (in timezone Europe/Warsaw) - Branch creation - At any time (no schedule defined) - Automerge - At any time (no schedule defined) 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://github.com/renovatebot/renovate).  Reviewed-on: https://git.ajgon.casa/deedee/mark13/pulls/10

dosubot Bot added size:XS This PR changes 0-9 lines, ignoring generated files. bug Something isn't working labels May 27, 2026

leonardoce force-pushed the transient-status branch from 163c47f to 40f7ce2 Compare May 27, 2026 09:31

leonardoce requested a review from a team as a code owner May 27, 2026 09:31

dosubot Bot added size:M This PR changes 30-99 lines, ignoring generated files. and removed size:XS This PR changes 0-9 lines, ignoring generated files. labels May 27, 2026

armru force-pushed the transient-status branch from 40f7ce2 to 7c63be1 Compare May 28, 2026 14:43

armru approved these changes May 28, 2026

View reviewed changes

dosubot Bot added the lgtm This PR has been approved by a maintainer label May 28, 2026

litaocdl approved these changes Jun 1, 2026

View reviewed changes

litaocdl force-pushed the transient-status branch 2 times, most recently from ee7633f to 0d04924 Compare June 1, 2026 09:49

litaocdl reviewed Jun 1, 2026

View reviewed changes

Comment thread config/crd/bases/barmancloud.cnpg.io_objectstores.yaml

litaocdl force-pushed the transient-status branch 3 times, most recently from bd957d3 to be88823 Compare June 2, 2026 05:50

leonardoce and others added 6 commits June 3, 2026 10:55

chore: remove replace in go mod

3c08bb7

Signed-off-by: Tao Li <tao.li@enterprisedb.com>

fix: use correct ErrInvalidWALName

137a618

Signed-off-by: Tao Li <tao.li@enterprisedb.com>

leonardoce force-pushed the transient-status branch from be88823 to 137a618 Compare June 3, 2026 08:55

litaocdl self-requested a review June 3, 2026 09:21

litaocdl approved these changes Jun 3, 2026

View reviewed changes

armru approved these changes Jun 3, 2026

View reviewed changes

leonardoce merged commit aaf6120 into cloudnative-pg:main Jun 3, 2026
4 checks passed

cnpg-bot mentioned this pull request Jun 3, 2026

chore(main): release 0.13.0 #860

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: classify WAL restore errors with precise gRPC statuses#927

fix: classify WAL restore errors with precise gRPC statuses#927
leonardoce merged 6 commits into
cloudnative-pg:mainfrom
leonardoce:transient-status

leonardoce commented May 27, 2026

Uh oh!

leonardoce commented May 27, 2026

Uh oh!

gbartolini commented May 29, 2026

Uh oh!

gbartolini commented May 29, 2026

Uh oh!

gbartolini commented May 29, 2026

Uh oh!

Uh oh!

litaocdl commented Jun 2, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

leonardoce commented May 27, 2026

Uh oh!

leonardoce commented May 27, 2026

Uh oh!

gbartolini commented May 29, 2026

Uh oh!

gbartolini commented May 29, 2026

Uh oh!

gbartolini commented May 29, 2026

Uh oh!

Uh oh!

litaocdl commented Jun 2, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants