Skip to content

NAS backup: keep the Failed row when the agent reports a failed backup #14487

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

Open
abh1sar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

NAS backup: keep the Failed row when the agent reports a failed backup #14487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,8 +669,8 @@ public Pair<Boolean, Backup> takeBackup(final VirtualMachine vm, Boolean quiesce
return new Pair<>(false, backupVO);
}
backupVO.setStatus(Backup.Status.Failed);
backupDao.remove(backupVO.getId());
return new Pair<>(false, null);
backupDao.update(backupVO.getId(), backupVO);
return new Pair<>(false, backupVO);
Comment on lines 671 to +673
}
}

Expand Down
8 changes: 5 additions & 3 deletions plugins/backup/nas/src/test/java/org/apache/cloudstack/backup/NASBackupProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ public void takeBackupFailureNeedingCleanupReturnsErrorBackup() throws AgentUnav
}

@Test
public void takeBackupFailureWithoutCleanupRemovesBackup() throws AgentUnavailableException, OperationTimedoutException {
public void takeBackupFailureWithoutCleanupKeepsFailedBackup() throws AgentUnavailableException, OperationTimedoutException {
VMInstanceVO vm = mockRunningVmForBackup(1L, 2L, 3L, 4L, 5L, 6L);

BackupAnswer answer = mock(BackupAnswer.class);
Expand All @@ -324,8 +324,10 @@ public void takeBackupFailureWithoutCleanupRemovesBackup() throws AgentUnavailab
Pair<Boolean, Backup> result = nasBackupProvider.takeBackup(vm, false, false);

Assert.assertFalse(result.first());
Assert.assertNull(result.second());
Mockito.verify(backupDao).remove(Mockito.anyLong());
Assert.assertNotNull(result.second());
Assert.assertEquals(Backup.Status.Failed, result.second().getStatus());
Mockito.verify(backupDao).update(Mockito.anyLong(), Mockito.any(BackupVO.class));
Mockito.verify(backupDao, Mockito.never()).remove(Mockito.anyLong());
Mockito.verifyNoInteractions(alertManager);
}

Expand Down
Loading