Skip to content
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

Jump to bottom

chore: include volume snapshots in cluster status computation #2940

Merged
merged 21 commits into from
Nov 29, 2023
Merged

chore: include volume snapshots in cluster status computation #2940

merged 21 commits into from
Nov 29, 2023

Conversation

jsilvela
Copy link
Collaborator

@jsilvela jsilvela commented Sep 29, 2023 •
edited

This patch enhances the computation of the first recoverability point
for a cluster by considering volume snapshots in addition to object
store backups.
To ensure no information is lost, it introduces a new field in the
cluster status where the oldest backup available per-method is recorded.
The overall FirstRecoverabilityPoint is computed as the oldest among them.

Closes #2924

@github-actions github-actions bot added backport-requested ◀️ This pull request should be backported to all supported releases release-1.19 release-1.20 labels Sep 29, 2023
@github-actions
Copy link
Contributor

❗ By default, the pull request is configured to backport to all release branches.

  • To stop backporting this pr, remove the label: backport-requested ◀️ or add the label 'do not backport'
  • To stop backporting this pr to a certain release branch, remove the specific branch label: release-x.y

@jsilvela
Copy link
Collaborator Author

/test

@github-actions
Copy link
Contributor

@jsilvela, here's the link to the E2E on CNPG workflow run: https://github.com/cloudnative-pg/cloudnative-pg/actions/runs/6362405973

@jsilvela
Copy link
Collaborator Author

/test

@github-actions
Copy link
Contributor

@jsilvela, here's the link to the E2E on CNPG workflow run: https://github.com/cloudnative-pg/cloudnative-pg/actions/runs/6363973185

@gbartolini gbartolini added do not backport This PR must not be backported - it will be in the next minor release and removed backport-requested ◀️ This pull request should be backported to all supported releases release-1.19 release-1.20 labels Oct 5, 2023
@gbartolini gbartolini added backport-requested ◀️ This pull request should be backported to all supported releases release-1.21 and removed do not backport This PR must not be backported - it will be in the next minor release labels Oct 26, 2023
@jsilvela
Copy link
Collaborator Author

/test

@github-actions
Copy link
Contributor

@jsilvela, here's the link to the E2E on CNPG workflow run: https://github.com/cloudnative-pg/cloudnative-pg/actions/runs/6657235273

@jsilvela
Copy link
Collaborator Author

E2E tests running on shadow repo: https://github.com/EnterpriseDB/cloudnative-pg/actions/runs/6666904006

@jsilvela
Copy link
Collaborator Author

/test

@github-actions
Copy link
Contributor

@jsilvela, here's the link to the E2E on CNPG workflow run: https://github.com/cloudnative-pg/cloudnative-pg/actions/runs/6677190506

@jsilvela jsilvela changed the title chore: take volume snapshots into account computing recoverability points chore: include volume snapshots in first recoverability point computation Oct 30, 2023
jsilvela and others added 20 commits November 29, 2023 11:06
@jsilvela @mnencia
This patch enhances the computation of the first recoverability point
a953ab5 
for a cluster by considering volume snapshots taken for the cluster,
in addition to object store backups.

Closes #2924

Signed-off-by: Jaime Silvela <jaime.silvela@enterprisedb.com>
@jsilvela @mnencia
chore: check only pgdata snapshots for FRP
7b43f39 
Signed-off-by: Jaime Silvela <jaime.silvela@enterprisedb.com>
@jsilvela @mnencia
chore: fix comments
a43a64a 
Signed-off-by: Jaime Silvela <jaime.silvela@enterprisedb.com>
@jsilvela @mnencia
review: track FRP per method
fd8ea92 
Signed-off-by: Jaime Silvela <jaime.silvela@enterprisedb.com>
@jsilvela @mnencia
feat: add non-destructive FRP to barman backups
88a87e7 
Signed-off-by: Jaime Silvela <jaime.silvela@enterprisedb.com>
@jsilvela @mnencia
chore: fix after rebase
361d52d 
Signed-off-by: Jaime Silvela <jaime.silvela@enterprisedb.com>
@jsilvela @mnencia
chore: clean up
1524d2e 
Signed-off-by: Jaime Silvela <jaime.silvela@enterprisedb.com>
@jsilvela @mnencia
test: barman update of FRP
bdeb9d7 
Signed-off-by: Jaime Silvela <jaime.silvela@enterprisedb.com>
@jsilvela @mnencia
fix: locating of data volumeSnapshots
cd035aa 
Signed-off-by: Jaime Silvela <jaime.silvela@enterprisedb.com>
@jsilvela @mnencia
chore: better tests
c81bf5e 
Signed-off-by: Jaime Silvela <jaime.silvela@enterprisedb.com>
Signed-off-by: Tao Li <tao.li@enterprisedb.com>
@litaocdl @mnencia
review: spellcheck
64b827b 
Signed-off-by: Tao Li <tao.li@enterprisedb.com>
@mnencia
chore: Use metav1.Time
829663a 
Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
@mnencia
feat: LastSuccessfulBackup needs the same treatment
139cbb7 
Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
@mnencia
refactor: virtual fields
67f9040 
Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
@mnencia
wip: do not use it
ec5b6d5 
Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
@armru @mnencia
fix: fix various bugs and change approach
5cf4bde 
Signed-off-by: Armando Ruocco <armando.ruocco@enterprisedb.com>
@mnencia
final style fixes
314a054 
Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
@mnencia
fix: unit test
28613de 
Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
@mnencia
docs: change some names, updated some docstring
5e4203f 
Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
@jsilvela @mnencia
review: some clarifications
78e6ce3 
Signed-off-by: Jaime Silvela <jaime.silvela@enterprisedb.com>
@mnencia
Copy link
Member

mnencia commented Nov 29, 2023

E2E tests running in EDB fork https://github.com/EnterpriseDB/cloudnative-pg/actions/runs/7031008229

@mnencia
Copy link
Member

mnencia commented Nov 29, 2023

/ok-to-merge the E2E executed in the EDB fork are green

@cnpg-bot cnpg-bot added the ok to merge 👌 This PR can be merged label Nov 29, 2023
@mnencia
docs: update generated docs
fcfb43c 
Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
@mnencia mnencia changed the title chore: include volume snapshots in first recoverability point computation chore: include volume snapshots in cluster status computation Nov 29, 2023
@mnencia mnencia merged commit 206ba9c into main Nov 29, 2023
32 checks passed
@mnencia mnencia deleted the dev/2924-2 branch November 29, 2023 16:58
cnpg-bot pushed a commit that referenced this pull request Nov 29, 2023
@jsilvela
chore: include volume snapshots in cluster status computation (#2940)
7eb176e 
This patch improves the computation of the first recoverability point
and last successful backup for a cluster by taking volume snapshots
into account alongside object-store backups.

Closes #2924

Signed-off-by: Jaime Silvela <jaime.silvela@enterprisedb.com>
Signed-off-by: Tao Li <tao.li@enterprisedb.com>
Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
Signed-off-by: Armando Ruocco <armando.ruocco@enterprisedb.com>
Co-authored-by: Tao Li <tao.li@enterprisedb.com>
Co-authored-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
Co-authored-by: Armando Ruocco <armando.ruocco@enterprisedb.com>
(cherry picked from commit 206ba9c)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mnencia mnencia mnencia approved these changes

@litaocdl litaocdl litaocdl approved these changes

@fcanovai fcanovai Awaiting requested review from fcanovai

@gbartolini gbartolini Awaiting requested review from gbartolini

@leonardoce leonardoce Awaiting requested review from leonardoce

@phisco phisco Awaiting requested review from phisco

@sxd sxd Awaiting requested review from sxd

@armru armru Awaiting requested review from armru

Assignees
No one assigned
Labels
backport-requested ◀️ This pull request should be backported to all supported releases ok to merge 👌 This PR can be merged release-1.21
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Point of recoverability should also consider volume snapshots
6 participants
@jsilvela @litaocdl @mnencia @gbartolini @cnpg-bot @armru