Skip to content

Rollback of changes with errors during the VM assign #7061

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
DaanHoogland merged 11 commits into from
Jan 15, 2025
+2,203 −464
Merged

Rollback of changes with errors during the VM assign #7061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1d56abc
Refactor and revert changes with assign VM error
Jan 4, 2023
dd1fe0f
Use CloudRuntimeException
Feb 6, 2023
5846f71
fix limit count of user_vm
May 10, 2024
86d9081
Merge 4.20
winterhazel Nov 28, 2024
be345c7
More explicit exception
winterhazel Nov 28, 2024
1902eee
Replace String.format() with parametrized messages
winterhazel Nov 29, 2024
d15a4f5
Add missing import
winterhazel Nov 29, 2024
32ae56e
Fix build
winterhazel Nov 29, 2024
1c79d0d
Fix tests
winterhazel Nov 29, 2024
453896a
Merge branch '4.20' into rollback-on-assign-vm-error
winterhazel Jan 8, 2025
7d882a9
Fix build
winterhazel Jan 8, 2025
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
2 changes: 1 addition & 1 deletion api/src/main/java/com/cloud/vm/UserVmService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ VirtualMachine migrateVirtualMachine(Long vmId, Host destinationHost) throws Res
VirtualMachine migrateVirtualMachineWithVolume(Long vmId, Host destinationHost, Map<String, String> volumeToPool) throws ResourceUnavailableException,
ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException;

UserVm moveVMToUser(AssignVMCmd moveUserVMCmd) throws ResourceAllocationException, ConcurrentOperationException, ResourceUnavailableException,
UserVm moveVmToUser(AssignVMCmd moveUserVMCmd) throws ResourceAllocationException, ConcurrentOperationException, ResourceUnavailableException,
InsufficientCapacityException;

VirtualMachine vmStorageMigration(Long vmId, StoragePool destPool);
Expand Down
21 changes: 5 additions & 16 deletions api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,27 +120,16 @@ public List<Long> getSecurityGroupIdList() {
@Override
public void execute() {
try {
UserVm userVm = _userVmService.moveVMToUser(this);
if (userVm == null) {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to move vm");
}
UserVm userVm = _userVmService.moveVmToUser(this);
UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Full, "virtualmachine", userVm).get(0);
response.setResponseName(getCommandName());
setResponseObject(response);
} catch (InvalidParameterValueException e){
e.printStackTrace();
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
} catch (Exception e) {
logger.error("Failed to move vm due to: " + e.getStackTrace());
if (e.getMessage() != null) {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to move vm due to " + e.getMessage());
} else if (e.getCause() != null) {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to move vm due to " + e.getCause());
} else {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to move vm");
}
ApiErrorCode errorCode = e instanceof InvalidParameterValueException ? ApiErrorCode.PARAM_ERROR : ApiErrorCode.INTERNAL_ERROR;
String msg = String.format("Failed to move VM [%s].", getVmId());
logger.error(msg, e);
throw new ServerApiException(errorCode, msg);
}

}

@Override
Expand Down
Loading