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

return job for async=false as well 

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
This commit is contained in:
Abhishek Kumar 2026-02-12 11:03:41 +05:30
parent 047595d938
commit 2352c83378
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,7 +134,6 @@ import com.cloud.user.Account;
import com.cloud.user.AccountService;
import com.cloud.user.User;
import com.cloud.user.UserAccount;
import com.cloud.user.dao.UserAccountDao;
import com.cloud.uservm.UserVm;
import com.cloud.utils.EnumUtils;
import com.cloud.utils.Pair;
@ -147,7 +146,6 @@ import com.cloud.vm.UserVmVO;
import com.cloud.vm.VmDetailConstants;
import com.cloud.vm.dao.NicDao;
import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.snapshot.VMSnapshotService;
import com.cloud.vm.snapshot.VMSnapshotVO;
import com.cloud.vm.snapshot.dao.VMSnapshotDao;
@ -179,9 +177,6 @@ public class ServerAdapter extends ManagerBase {
@Inject
AccountService accountService;
@Inject
UserAccountDao userAccountDao;
@Inject
DataCenterDao dataCenterDao;
@ -251,9 +246,6 @@ public class ServerAdapter extends ManagerBase {
@Inject
VMSnapshotDao vmSnapshotDao;
@Inject
VMSnapshotService vmSnapshotService;
//ToDo: check access on objects
protected Role createServiceAccountRole() {
@ -960,21 +952,20 @@ public class ServerAdapter extends ManagerBase {
Pair<User, Account> serviceUserAccount = createServiceAccountIfNeeded();
CallContext ctx = CallContext.register(serviceUserAccount.first(), serviceUserAccount.second());
try {
DeleteVMSnapshotCmd cmd = new DeleteVMSnapshotCmd();
ComponentContext.inject(cmd);
Map<String, String> params = new HashMap<>();
params.put(ApiConstants.VM_SNAPSHOT_ID, vo.getUuid());
ApiServerService.AsyncCmdResult result =
apiServerService.processAsyncCmd(cmd, params, ctx, serviceUserAccount.first().getId(),
serviceUserAccount.second());
AsyncJobJoinVO jobVo = asyncJobJoinDao.findById(result.jobId);
if (jobVo == null) {
throw new CloudRuntimeException("Failed to find job for snapshot deletion");
}
action = AsyncJobJoinVOToJobConverter.toAction(jobVo);
if (async) {
DeleteVMSnapshotCmd cmd = new DeleteVMSnapshotCmd();
ComponentContext.inject(cmd);
Map<String, String> params = new HashMap<>();
params.put(ApiConstants.VM_SNAPSHOT_ID, vo.getUuid());
ApiServerService.AsyncCmdResult result =
apiServerService.processAsyncCmd(cmd, params, ctx, serviceUserAccount.first().getId(),
serviceUserAccount.second());
AsyncJobJoinVO jobVo = asyncJobJoinDao.findById(result.jobId);
if (jobVo == null) {
throw new CloudRuntimeException("Failed to find job for snapshot deletion");
}
action = AsyncJobJoinVOToJobConverter.toAction(jobVo);
} else {
vmSnapshotService.deleteVMSnapshot(vo.getId());
// ToDo: wait for job completion?
}
} catch (Exception e) {
throw new CloudRuntimeException("Failed to delete snapshot: " + e.getMessage(), e);