Skip to content

[Mold] BackingUp 상태로 남은 백업본 정리 #815

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

Merged
jschoiRR merged 3 commits into from
Apr 28, 2026
+60 −2
Merged

[Mold] BackingUp 상태로 남은 백업본 정리 #815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e3ec0e
backingup 상태로 남은 백업본 생성된지 하루지난 경우 백엔드에서 정리
Dajeong-Park Apr 23, 2026
729af58
백업 삭제 중복된 부분 제거
Dajeong-Park Apr 24, 2026
8f29c77
해당 provider의 백업본만 sync타도록
Dajeong-Park Apr 24, 2026
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
26 changes: 26 additions & 0 deletions .../backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
import java.util.stream.Collectors;
import java.util.Collections;
import java.util.Comparator;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.inject.Inject;
Expand All @@ -104,6 +105,7 @@ public class CommvaultBackupProvider extends AdapterBase implements BackupProvid
private static final int BASE_MT = 89;
private static final Pattern VERSION_PATTERN = Pattern.compile("^(\\d+)\\s*SP\\s*(\\d+)(?:\\.(\\d+))?$", Pattern.CASE_INSENSITIVE);
private static final String COMMVAULT_DIRECTORY = "/tmp/mold/backup";
private static final long STALE_BACKUP_THRESHOLD_MS = TimeUnit.DAYS.toMillis(1);

public ConfigKey<String> CommvaultUrl = new ConfigKey<>("Advanced", String.class,
"backup.plugin.commvault.url", "https://localhost/commandcenter/api",
Expand Down Expand Up @@ -860,6 +862,11 @@ public String getDescription() {
return "Commvault Backup Plugin";
}

private boolean isBackupManagedByThisProvider(Backup backup) {
BackupOffering offering = backupOfferingDao.findByIdIncludingRemoved(backup.getBackupOfferingId());
return offering != null && Objects.equals(getName(), offering.getProvider());
}

@Override
public String getConfigComponentName() {
return BackupService.class.getSimpleName();
Expand All @@ -874,6 +881,21 @@ public void syncBackups(VirtualMachine vm) {
}
final CommvaultClient client = getClient(vm.getDataCenterId());
for (final Backup backup: backupDao.listByVmId(vm.getDataCenterId(), vm.getId())) {
if (!isBackupManagedByThisProvider(backup)) {
continue;
}
if (Backup.Status.BackingUp.equals(backup.getStatus()) && isOlderThanOneDay(backup.getDate())) {
LOG.warn("Removing stale Commvault backup [{}] for VM [{}] stuck in BackingUp for over one day. External ID: [{}]",
backup.getUuid(), vm.getInstanceName(), backup.getExternalId());
try {
if (deleteBackup(backup, true)) {
backupDao.remove(backup.getId());
}
} catch (Exception e) {
LOG.warn("Failed to delete stale Commvault backup [{}] for VM [{}]", backup.getUuid(), vm.getInstanceName(), e);
}
continue;
}
String externalId = backup.getExternalId();
String jobId = externalId.substring(externalId.lastIndexOf(',') + 1).trim();
String path = externalId.substring(0, externalId.lastIndexOf(','));
Expand Down Expand Up @@ -906,6 +928,10 @@ public void syncBackups(VirtualMachine vm) {
return;
}

private boolean isOlderThanOneDay(Date backupDate) {
return backupDate != null && backupDate.getTime() <= System.currentTimeMillis() - STALE_BACKUP_THRESHOLD_MS;
}

@Override
public boolean checkBackupAgent(final Long zoneId) {
Map<String, String> checkResult = new HashMap<>();
Expand Down
36 changes: 34 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 @@ -50,6 +50,7 @@


import org.apache.cloudstack.backup.dao.BackupDao;
import org.apache.cloudstack.backup.dao.BackupOfferingDao;
import org.apache.cloudstack.backup.dao.BackupRepositoryDao;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
Expand All @@ -72,13 +73,15 @@
import java.util.Locale;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
import java.util.UUID;
import java.util.stream.Collectors;

import static org.apache.cloudstack.backup.BackupManager.BackupFrameworkEnabled;

public class NASBackupProvider extends AdapterBase implements BackupProvider, Configurable {
private static final Logger LOG = LogManager.getLogger(NASBackupProvider.class);
private static final long STALE_BACKUP_THRESHOLD_MS = TimeUnit.DAYS.toMillis(1);

ConfigKey<Integer> NASBackupRestoreMountTimeout = new ConfigKey<>("Advanced", Integer.class,
"nas.backup.restore.mount.timeout",
Expand All @@ -90,6 +93,9 @@ public class NASBackupProvider extends AdapterBase implements BackupProvider, Co
@Inject
private BackupDao backupDao;

@Inject
private BackupOfferingDao backupOfferingDao;

@Inject
private BackupRepositoryDao backupRepositoryDao;

Expand Down Expand Up @@ -481,7 +487,7 @@ public boolean deleteBackup(Backup backup, boolean forced) {
}

if (answer != null && answer.getResult()) {
return backupDao.remove(backup.getId());
return true;
}

logger.debug("There was an error removing the backup with id {}", backup.getId());
Expand Down Expand Up @@ -600,13 +606,39 @@ public String getDescription() {
return "NAS Backup Plugin";
}

private boolean isBackupManagedByThisProvider(Backup backup) {
BackupOffering offering = backupOfferingDao.findByIdIncludingRemoved(backup.getBackupOfferingId());
return offering != null && Objects.equals(getName(), offering.getProvider());
}

@Override
public String getConfigComponentName() {
return BackupService.class.getSimpleName();
}

@Override
public void syncBackups(VirtualMachine vm) {
for (final Backup backup : backupDao.listByVmId(vm.getDataCenterId(), vm.getId())) {
if (!isBackupManagedByThisProvider(backup)) {
continue;
}
if (!(backup instanceof BackupVO) || !Backup.Status.BackingUp.equals(backup.getStatus()) || !isOlderThanOneDay(backup.getDate())) {
continue;
}
LOG.warn("Removing stale NAS backup [{}] for VM [{}] stuck in BackingUp for over one day. Repository path: [{}]",
backup.getUuid(), vm.getInstanceName(), backup.getExternalId());
try {
if (deleteBackup(backup, true)) {
backupDao.remove(backup.getId());
}
} catch (Exception e) {
LOG.warn("Failed to delete stale NAS backup [{}] for VM [{}]", backup.getUuid(), vm.getInstanceName(), e);
}
}
}

private boolean isOlderThanOneDay(Date backupDate) {
return backupDate != null && backupDate.getTime() <= System.currentTimeMillis() - STALE_BACKUP_THRESHOLD_MS;
}

@Override
Expand All @@ -621,4 +653,4 @@ public void syncBackups(VirtualMachine vm) {
@Override
public boolean updateBackupPlan(final Long zoneId, final String retentionPeriod, final String externalId) { return true; }

}
}
Loading