Skip to content

server: Fix backup scheduling when async jobs expire #14587

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
winterhazel wants to merge 1 commit into
base: 4.22
Choose a base branch
from
Open

server: Fix backup scheduling when async jobs expire #14587

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
10 changes: 8 additions & 2 deletions server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1819,7 +1819,7 @@ public void poll(final Date timestamp) {
}

@DB
private Date scheduleNextBackupJob(final BackupScheduleVO backupSchedule) {
protected Date scheduleNextBackupJob(final BackupScheduleVO backupSchedule) {
final Date nextTimestamp = DateUtil.getNextRunTime(backupSchedule.getScheduleType(), backupSchedule.getSchedule(),
backupSchedule.getTimezone(), currentTimestamp);
return Transaction.execute(new TransactionCallback<Date>() {
Expand All @@ -1833,13 +1833,19 @@ public Date doInTransaction(TransactionStatus status) {
});
}

private void checkStatusOfCurrentlyExecutingBackups() {
protected void checkStatusOfCurrentlyExecutingBackups() {
final SearchCriteria<BackupScheduleVO> sc = backupScheduleDao.createSearchCriteria();
sc.addAnd("asyncJobId", SearchCriteria.Op.NNULL);
final List<BackupScheduleVO> backupSchedules = backupScheduleDao.search(sc, null);
for (final BackupScheduleVO backupSchedule : backupSchedules) {
final Long asyncJobId = backupSchedule.getAsyncJobId();
final AsyncJobVO asyncJob = asyncJobManager.getAsyncJob(asyncJobId);
if (asyncJob == null) {
logger.debug("The async job [{}] of backup schedule [{}] does not exist anymore. Considering it as finished and scheduling the next backup job.",
asyncJobId, backupSchedule);
scheduleNextBackupJob(backupSchedule);
continue;
}
switch (asyncJob.getStatus()) {
case SUCCEEDED:
case FAILED:
Expand Down
14 changes: 14 additions & 0 deletions server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2432,4 +2432,18 @@ public void testRestoreBackupVolumeMismatch() {
verify(vmInstanceDao, times(1)).findByIdIncludingRemoved(vmId);
verify(volumeDao, times(1)).findByInstance(vmId);
}

@Test
public void checkStatusOfCurrentlyExecutingBackupsTestMissingAsyncJobSchedulesNextBackup() {
BackupScheduleVO backupSchedule = mock(BackupScheduleVO.class);
doReturn(1L).when(backupSchedule).getAsyncJobId();
doReturn(mock(SearchCriteria.class)).when(backupScheduleDao).createSearchCriteria();
doReturn(List.of(backupSchedule)).when(backupScheduleDao).search(any(), any());
doReturn(null).when(asyncJobManager).getAsyncJob(1L);
doReturn(new Date()).when(backupManager).scheduleNextBackupJob(backupSchedule);

backupManager.checkStatusOfCurrentlyExecutingBackups();

verify(backupManager).scheduleNextBackupJob(backupSchedule);
}
}
Loading