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

fix: do not retake backup if it already exists #12626

Merged
merged 3 commits into from May 3, 2023
Merged

fix: do not retake backup if it already exists #12626

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a886d80
fix(backup): do not take backup when one already exists
deepthidevaki May 2, 2023
8763717
test(backup): verify backup is not re-taken when already exist
deepthidevaki May 2, 2023
65e08d9
refactor(backup): use existing comparator
deepthidevaki May 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions backup/src/main/java/io/camunda/zeebe/backup/management/BackupAlreadyExistsException.java
View file
Open in desktop
Expand Up @@ -8,11 +8,11 @@
package io.camunda.zeebe.backup.management;

import io.camunda.zeebe.backup.api.BackupIdentifier;
import io.camunda.zeebe.backup.api.BackupStatus;
import io.camunda.zeebe.backup.api.BackupStatusCode;

class BackupAlreadyExistsException extends RuntimeException {

BackupAlreadyExistsException(final BackupIdentifier id, final BackupStatus status) {
BackupAlreadyExistsException(final BackupIdentifier id, final BackupStatusCode status) {
super("Backup with id %s already exists, status of the backup is %s".formatted(id, status));
}
}
27 changes: 20 additions & 7 deletions backup/src/main/java/io/camunda/zeebe/backup/management/BackupServiceImpl.java
View file
Open in desktop
Expand Up @@ -15,6 +15,8 @@
import io.camunda.zeebe.scheduler.ConcurrencyControl;
import io.camunda.zeebe.scheduler.future.ActorFuture;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Optional;
import java.util.Set;
Expand Down Expand Up @@ -44,16 +46,22 @@ ActorFuture<Void> takeBackup(

backupsInProgress.add(inProgressBackup);

final var checkCurrentBackup = backupStore.getStatus(inProgressBackup.id());
final var checkCurrentBackup =
backupStore.list(
new BackupIdentifierWildcardImpl(
Optional.empty(),
Optional.of(inProgressBackup.id().partitionId()),
Optional.of(inProgressBackup.checkpointId())));

final ActorFuture<Void> backupSaved = concurrencyControl.createFuture();

checkCurrentBackup.whenCompleteAsync(
(status, error) -> {
(availableBackups, error) -> {
if (error != null) {
backupSaved.completeExceptionally(error);
} else {
takeBackupIfDoesNotExist(status, inProgressBackup, concurrencyControl, backupSaved);
takeBackupIfDoesNotExist(
availableBackups, inProgressBackup, concurrencyControl, backupSaved);
}
},
concurrencyControl::run);
Expand All @@ -63,12 +71,17 @@ ActorFuture<Void> takeBackup(
}

private void takeBackupIfDoesNotExist(
final BackupStatus status,
final Collection<BackupStatus> availableBackups,
final InProgressBackup inProgressBackup,
final ConcurrencyControl concurrencyControl,
final ActorFuture<Void> backupSaved) {

switch (status.statusCode()) {
final BackupStatusCode existingBackupStatus =
availableBackups.isEmpty()
? BackupStatusCode.DOES_NOT_EXIST
: Collections.max(availableBackups, Comparator.comparing(BackupStatus::statusCode))
deepthidevaki marked this conversation as resolved.
Show resolved Hide resolved
.statusCode();
switch (existingBackupStatus) {
case COMPLETED -> {
LOG.debug("Backup {} is already completed, will not take a new one", inProgressBackup.id());
backupSaved.complete(null);
Expand All @@ -77,9 +90,9 @@ private void takeBackupIfDoesNotExist(
LOG.error(
"Backup {} already exists with status {}, will not take a new one",
inProgressBackup.id(),
status);
existingBackupStatus);
backupSaved.completeExceptionally(
new BackupAlreadyExistsException(inProgressBackup.id(), status));
new BackupAlreadyExistsException(inProgressBackup.id(), existingBackupStatus));
}
default -> {
final ActorFuture<Void> snapshotFound = concurrencyControl.createFuture();
Expand Down