feat: honor the operator's check_empty_wal_archive decision#1009
Open
mnencia wants to merge 3 commits into
Open
feat: honor the operator's check_empty_wal_archive decision#1009mnencia wants to merge 3 commits into
mnencia wants to merge 3 commits into
Conversation
dosubot
Bot
added
size:M
mnencia
force-pushed
the
dev/check-empty-wal-archive
branch
2 times, most recently
from
July 16, 2026 17:08
23d9092 to
19a4121
Compare
armru
approved these changes
Jul 17, 2026
Archive() and the restore job hook each re-derived, on their own, whether to verify the WAL archive destination is empty, by reading a Cluster annotation and, for Archive, an on-disk marker file. That decision belongs to the operator, which already tracks both the annotation and the marker file's lifecycle. Honor cnpg-i's new WALArchiveRequest/RestoreRequest field CheckEmptyWalArchive when the operator sets it: obey it directly, without re-inspecting the marker file. Only fall back to the previous annotation-and-marker-file logic when talking to an operator that predates this field. Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
The WAL archive hook and the restore job hook each derived, inline, whether to verify the archive destination before proceeding. Pull each decision into a small function so the operator-decision-versus-fallback logic can be exercised on its own. Behavior is unchanged: archiving still fails on a marker-file stat error, and restore still falls back to the Cluster annotation alone. Signed-off-by: Armando Ruocco <armando.ruocco@enterprisedb.com>
Add unit coverage for the WAL archive and restore-job decision helpers. The tables pin the version-skew contract: when the operator sets the decision it overrides both the Cluster annotation and, for archiving, the on-disk marker file, while a nil decision (an operator that predates the field) reproduces the previous annotation-based behavior. Signed-off-by: Armando Ruocco <armando.ruocco@enterprisedb.com>
mnencia
force-pushed
the
dev/check-empty-wal-archive
branch
from
July 17, 2026 16:16
959f6bd to
664f808
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Archive() and the restore job hook each re-derived, on their own, whether to verify the WAL archive destination is empty, by reading a Cluster annotation and, for Archive, an on-disk marker file. That decision belongs to the operator, which already tracks both the annotation and the marker file's lifecycle.
Honor cnpg-i's new WALArchiveRequest/RestoreRequest field CheckEmptyWalArchive when the operator sets it: obey it directly, without re-inspecting the marker file. Only fall back to the previous annotation-and-marker-file logic when talking to an operator that predates this field.
Related: cloudnative-pg/cnpg-i#353 adds the field this depends on; cloudnative-pg/cloudnative-pg#11216 is the operator-side counterpart.