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

Revert "Rollback of changes with errors during the VM assign (#7061)" 

This reverts commit d9a7b6e511.
This commit is contained in:
Abhishek Kumar 2025-05-13 13:25:58 +05:30 committed by GitHub
parent 011fced91e
commit 734ce3cfa9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 482 additions and 2221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/cloud/vm/UserVmService.java
View File

@ -469,7 +469,7 @@ public interface UserVmService {
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);

21
api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
View File

@ -120,16 +120,27 @@ public class AssignVMCmd extends BaseCmd {
@Override
public void execute() {
try {
UserVm userVm = _userVmService.moveVmToUser(this);
UserVm userVm = _userVmService.moveVMToUser(this);
if (userVm == null) {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to move vm");
}
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) {
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);
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");
}
}
}
@Override

1143
server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
View File

File diff suppressed because it is too large Load Diff

1533
server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java
View File

File diff suppressed because it is too large Load Diff

4
server/src/test/java/com/cloud/vm/UserVmManagerTest.java
View File

@ -477,7 +477,7 @@ public class UserVmManagerTest {
CallContext.register(user, caller);
try {
_userVmMgr.moveVmToUser(cmd);
_userVmMgr.moveVMToUser(cmd);
} finally {
CallContext.unregister();
}
@ -527,7 +527,7 @@ public class UserVmManagerTest {
when(_accountMgr.isRootAdmin(anyLong())).thenReturn(true);
try {
_userVmMgr.moveVmToUser(cmd);
_userVmMgr.moveVMToUser(cmd);
} finally {
CallContext.unregister();
}