etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change name from IncrementalBackupService to KVMBackupExportService

This commit is contained in:
abh1sar 2026-03-28 14:34:39 +05:30 committed by Abhishek Kumar
parent 5b71847813
commit 8d42d5f186
11 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/main/java/org/apache/cloudstack/api/command/admin/backup/CreateImageTransferCmd.java
View File

@ -29,7 +29,7 @@ import org.apache.cloudstack.api.response.BackupResponse;
import org.apache.cloudstack.api.response.ImageTransferResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.backup.ImageTransfer;
import org.apache.cloudstack.backup.IncrementalBackupService;
import org.apache.cloudstack.backup.KVMBackupExportService;
import org.apache.cloudstack.context.CallContext;
import com.cloud.utils.EnumUtils;
@ -42,7 +42,7 @@ import com.cloud.utils.EnumUtils;
public class CreateImageTransferCmd extends BaseCmd implements AdminCmd {
@Inject
private IncrementalBackupService incrementalBackupService;
private KVMBackupExportService kvmBackupExportService;
@Parameter(name = ApiConstants.BACKUP_ID,
type = CommandType.UUID,
@ -86,7 +86,7 @@ public class CreateImageTransferCmd extends BaseCmd implements AdminCmd {
@Override
public void execute() {
ImageTransferResponse response = incrementalBackupService.createImageTransfer(this);
ImageTransferResponse response = kvmBackupExportService.createImageTransfer(this);
response.setResponseName(getCommandName());
setResponseObject(response);
}

6
api/src/main/java/org/apache/cloudstack/api/command/admin/backup/DeleteVmCheckpointCmd.java
View File

@ -27,7 +27,7 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.backup.IncrementalBackupService;
import org.apache.cloudstack.backup.KVMBackupExportService;
import org.apache.cloudstack.context.CallContext;
@APICommand(name = "deleteVirtualMachineCheckpoint",
@ -38,7 +38,7 @@ import org.apache.cloudstack.context.CallContext;
public class DeleteVmCheckpointCmd extends BaseCmd implements AdminCmd {
@Inject
private IncrementalBackupService incrementalBackupService;
private KVMBackupExportService kvmBackupExportService;
@Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
type = CommandType.UUID,
@ -71,7 +71,7 @@ public class DeleteVmCheckpointCmd extends BaseCmd implements AdminCmd {
@Override
public void execute() {
boolean result = incrementalBackupService.deleteVmCheckpoint(this);
boolean result = kvmBackupExportService.deleteVmCheckpoint(this);
SuccessResponse response = new SuccessResponse(getCommandName());
response.setSuccess(result);
response.setResponseName(getCommandName());

6
api/src/main/java/org/apache/cloudstack/api/command/admin/backup/FinalizeBackupCmd.java
View File

@ -31,7 +31,7 @@ import org.apache.cloudstack.api.response.BackupResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.backup.Backup;
import org.apache.cloudstack.backup.BackupManager;
import org.apache.cloudstack.backup.IncrementalBackupService;
import org.apache.cloudstack.backup.KVMBackupExportService;
import org.apache.cloudstack.context.CallContext;
import com.cloud.event.EventTypes;
@ -44,7 +44,7 @@ import com.cloud.event.EventTypes;
public class FinalizeBackupCmd extends BaseAsyncCmd implements AdminCmd {
@Inject
private IncrementalBackupService incrementalBackupService;
private KVMBackupExportService kvmBackupExportService;
@Inject
private BackupManager backupManager;
@ -73,7 +73,7 @@ public class FinalizeBackupCmd extends BaseAsyncCmd implements AdminCmd {
@Override
public void execute() {
Backup backup = incrementalBackupService.finalizeBackup(this);
Backup backup = kvmBackupExportService.finalizeBackup(this);
if (backup == null) {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create Backup");

6
api/src/main/java/org/apache/cloudstack/api/command/admin/backup/FinalizeImageTransferCmd.java
View File

@ -27,7 +27,7 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.response.ImageTransferResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.backup.IncrementalBackupService;
import org.apache.cloudstack.backup.KVMBackupExportService;
import org.apache.cloudstack.context.CallContext;
@APICommand(name = "finalizeImageTransfer",
@ -38,7 +38,7 @@ import org.apache.cloudstack.context.CallContext;
public class FinalizeImageTransferCmd extends BaseCmd implements AdminCmd {
@Inject
private IncrementalBackupService incrementalBackupService;
private KVMBackupExportService kvmBackupExportService;
@Parameter(name = ApiConstants.ID,
type = CommandType.UUID,
@ -53,7 +53,7 @@ public class FinalizeImageTransferCmd extends BaseCmd implements AdminCmd {
@Override
public void execute() {
boolean result = incrementalBackupService.finalizeImageTransfer(this);
boolean result = kvmBackupExportService.finalizeImageTransfer(this);
SuccessResponse response = new SuccessResponse(getCommandName());
response.setSuccess(result);
response.setResponseName(getCommandName());

6
api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListImageTransfersCmd.java
View File

@ -30,7 +30,7 @@ import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.response.BackupResponse;
import org.apache.cloudstack.api.response.ImageTransferResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.backup.IncrementalBackupService;
import org.apache.cloudstack.backup.KVMBackupExportService;
import org.apache.cloudstack.context.CallContext;
@APICommand(name = "listImageTransfers",
@ -41,7 +41,7 @@ import org.apache.cloudstack.context.CallContext;
public class ListImageTransfersCmd extends BaseListCmd implements AdminCmd {
@Inject
private IncrementalBackupService incrementalBackupService;
private KVMBackupExportService kvmBackupExportService;
@Parameter(name = ApiConstants.ID,
type = CommandType.UUID,
@ -65,7 +65,7 @@ public class ListImageTransfersCmd extends BaseListCmd implements AdminCmd {
@Override
public void execute() {
List<ImageTransferResponse> responses = incrementalBackupService.listImageTransfers(this);
List<ImageTransferResponse> responses = kvmBackupExportService.listImageTransfers(this);
ListResponse<ImageTransferResponse> response = new ListResponse<>();
response.setResponses(responses);
response.setResponseName(getCommandName());

6
api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListVmCheckpointsCmd.java
View File

@ -30,7 +30,7 @@ import org.apache.cloudstack.api.command.admin.AdminCmd;
import org.apache.cloudstack.api.response.CheckpointResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.backup.IncrementalBackupService;
import org.apache.cloudstack.backup.KVMBackupExportService;
@APICommand(name = "listVirtualMachineCheckpoints",
description = "List checkpoints for a VM",
@ -40,7 +40,7 @@ import org.apache.cloudstack.backup.IncrementalBackupService;
public class ListVmCheckpointsCmd extends BaseListCmd implements AdminCmd {
@Inject
private IncrementalBackupService incrementalBackupService;
private KVMBackupExportService kvmBackupExportService;
@Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
type = CommandType.UUID,
@ -55,7 +55,7 @@ public class ListVmCheckpointsCmd extends BaseListCmd implements AdminCmd {
@Override
public void execute() {
List<CheckpointResponse> responses = incrementalBackupService.listVmCheckpoints(this);
List<CheckpointResponse> responses = kvmBackupExportService.listVmCheckpoints(this);
ListResponse<CheckpointResponse> response = new ListResponse<>();
response.setResponses(responses);
response.setResponseName(getCommandName());

8
api/src/main/java/org/apache/cloudstack/api/command/admin/backup/StartBackupCmd.java
View File

@ -31,7 +31,7 @@ import org.apache.cloudstack.api.response.BackupResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.backup.Backup;
import org.apache.cloudstack.backup.BackupManager;
import org.apache.cloudstack.backup.IncrementalBackupService;
import org.apache.cloudstack.backup.KVMBackupExportService;
import org.apache.cloudstack.context.CallContext;
import com.cloud.event.EventTypes;
@ -44,7 +44,7 @@ import com.cloud.event.EventTypes;
public class StartBackupCmd extends BaseAsyncCreateCmd implements AdminCmd {
@Inject
private IncrementalBackupService incrementalBackupService;
private KVMBackupExportService kvmBackupExportService;
@Inject
private BackupManager backupManager;
@ -81,7 +81,7 @@ import com.cloud.event.EventTypes;
@Override
public void execute() {
try {
Backup backup = incrementalBackupService.startBackup(this);
Backup backup = kvmBackupExportService.startBackup(this);
BackupResponse response = backupManager.createBackupResponse(backup, null);
response.setResponseName(getCommandName());
@ -98,7 +98,7 @@ import com.cloud.event.EventTypes;
@Override
public void create() {
Backup backup = incrementalBackupService.createBackup(this);
Backup backup = kvmBackupExportService.createBackup(this);
if (backup != null) {
setEntityId(backup.getId());

2
api/src/main/java/org/apache/cloudstack/backup/IncrementalBackupService.java → api/src/main/java/org/apache/cloudstack/backup/KVMBackupExportService.java
View File

@ -36,7 +36,7 @@ import com.cloud.utils.component.PluggableService;
/**
* Service for managing oVirt-style incremental backups using libvirt checkpoints
*/
public interface IncrementalBackupService extends Configurable, PluggableService {
public interface KVMBackupExportService extends Configurable, PluggableService {
ConfigKey<Long> ImageTransferPollingInterval = new ConfigKey<>("Advanced", Long.class,
"image.transfer.polling.interval",

12
plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/adapter/ServerAdapter.java
View File

@ -69,7 +69,7 @@ import org.apache.cloudstack.backup.BackupVO;
import org.apache.cloudstack.backup.ImageTransfer.Direction;
import org.apache.cloudstack.backup.ImageTransfer.Format;
import org.apache.cloudstack.backup.ImageTransferVO;
import org.apache.cloudstack.backup.IncrementalBackupService;
import org.apache.cloudstack.backup.KVMBackupExportService;
import org.apache.cloudstack.backup.dao.BackupDao;
import org.apache.cloudstack.backup.dao.ImageTransferDao;
import org.apache.cloudstack.context.CallContext;
@ -263,7 +263,7 @@ public class ServerAdapter extends ManagerBase {
ImageTransferDao imageTransferDao;
@Inject
IncrementalBackupService incrementalBackupService;
KVMBackupExportService kvmBackupExportService;
@Inject
QueryService queryService;
@ -1212,7 +1212,7 @@ public class ServerAdapter extends ManagerBase {
if (vo == null) {
throw new InvalidParameterValueException("Image transfer with ID " + uuid + " not found");
}
return incrementalBackupService.cancelImageTransfer(vo.getId());
return kvmBackupExportService.cancelImageTransfer(vo.getId());
}
public boolean finalizeImageTransfer(String uuid) {
@ -1220,7 +1220,7 @@ public class ServerAdapter extends ManagerBase {
if (vo == null) {
throw new InvalidParameterValueException("Image transfer with ID " + uuid + " not found");
}
return incrementalBackupService.finalizeImageTransfer(vo.getId());
return kvmBackupExportService.finalizeImageTransfer(vo.getId());
}
private ImageTransfer createImageTransfer(Long backupId, Long volumeId, Direction direction, Format format) {
@ -1228,7 +1228,7 @@ public class ServerAdapter extends ManagerBase {
CallContext.register(serviceUserAccount.first(), serviceUserAccount.second());
try {
org.apache.cloudstack.backup.ImageTransfer imageTransfer =
incrementalBackupService.createImageTransfer(volumeId, backupId, direction, format);
kvmBackupExportService.createImageTransfer(volumeId, backupId, direction, format);
ImageTransferVO imageTransferVO = imageTransferDao.findById(imageTransfer.getId());
return ImageTransferVOToImageTransferConverter.toImageTransfer(imageTransferVO, this::getHostById, this::getVolumeById);
} finally {
@ -1517,7 +1517,7 @@ public class ServerAdapter extends ManagerBase {
DeleteVmCheckpointCmd cmd = new DeleteVmCheckpointCmd();
ComponentContext.inject(cmd);
cmd.setVmId(vo.getId());
incrementalBackupService.deleteVmCheckpoint(cmd);
kvmBackupExportService.deleteVmCheckpoint(cmd);
} catch (Exception e) {
throw new CloudRuntimeException("Failed to delete checkpoint: " + e.getMessage(), e);
} finally {

4
server/src/main/java/org/apache/cloudstack/backup/IncrementalBackupServiceImpl.java → server/src/main/java/org/apache/cloudstack/backup/KVMBackupExportServiceImpl.java
View File

@ -76,7 +76,7 @@ import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.dao.VMInstanceDao;
@Component
public class IncrementalBackupServiceImpl extends ManagerBase implements IncrementalBackupService {
public class KVMBackupExportServiceImpl extends ManagerBase implements KVMBackupExportService {
@Inject
private VMInstanceDao vmInstanceDao;
@ -874,7 +874,7 @@ public class IncrementalBackupServiceImpl extends ManagerBase implements Increme
@Override
public String getConfigComponentName() {
return IncrementalBackupService.class.getSimpleName();
return KVMBackupExportService.class.getSimpleName();
}
@Override

2
server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
View File

@ -347,7 +347,7 @@
<bean id="backupRepositoryService" class="org.apache.cloudstack.backup.BackupRepositoryServiceImpl" />
<bean id="incrementalBackupService" class="org.apache.cloudstack.backup.IncrementalBackupServiceImpl" />
<bean id="kvmBackupExportService" class="org.apache.cloudstack.backup.KVMBackupExportServiceImpl" />
<bean id="storageLayer" class="com.cloud.storage.JavaStorageLayer" />