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.

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

[Backport stable/8.1] fix: do not retake backup if it already exists #12662

Merged
merged 4 commits into from May 4, 2023

Conversation

deepthidevaki
Copy link
Contributor

Backport of #12626 to stable/8.1.

relates to #12623

deepthidevaki and others added 3 commits May 4, 2023 08:48
Previously, we were only checking for backups taken by this node.
However, there could be backups taken by another node. For example, after
restore the checkpoint record is processed again, but it must not re-take
the backup. To prevent that, we should check for all backups with the given
backup id.

(cherry picked from commit a886d80)
Updated the test to remove mocking of InProgressBackup. The existing test
was updated to use list instead of getStatus to find duplicate backups.

(cherry picked from commit 8763717)
Co-authored-by: Ole Schönburg <ole.schoenburg@gmail.com>
(cherry picked from commit 65e08d9)
@deepthidevaki
Copy link
Contributor Author

Manual backport because of merge conflict in BackupAlreadyExistsException

Copy link
Member

@oleschoenburg oleschoenburg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bors r+

zeebe-bors-camunda bot added a commit that referenced this pull request May 4, 2023
12662: [Backport stable/8.1] fix: do not retake backup if it already exists r=oleschoenburg a=deepthidevaki

Backport of #12626 to stable/8.1.

relates to #12623

Co-authored-by: Deepthi Devaki Akkoorath <deepthidevaki@gmail.com>
Co-authored-by: Deepthi Devaki Akkoorath <deepthidevaki@users.noreply.github.com>
@zeebe-bors-camunda
Copy link
Contributor

Build failed:

@oleschoenburg
Copy link
Member

@deepthidevaki Looks like I was too fast, there are compilation errors.

bors r-

@deepthidevaki
Copy link
Contributor Author

Oops. I'm checking it.

@deepthidevaki
Copy link
Contributor Author

bors merge

@zeebe-bors-camunda
Copy link
Contributor

Build succeeded:

@zeebe-bors-camunda zeebe-bors-camunda bot merged commit f16558d into stable/8.1 May 4, 2023
27 checks passed
@zeebe-bors-camunda zeebe-bors-camunda bot deleted the backport-12626-to-stable/8.1 branch May 4, 2023 12:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants