Skip to content

Prevent NPE on reboot stopped VM and startVM output with null displayname #6397

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nvazquez merged 5 commits into from
May 20, 2022
Merged

Prevent NPE on reboot stopped VM and startVM output with null displayname #6397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f1d092f
Prevent NPE on reboot stopped VM
nvazquez May 18, 2022
16a0db1
Use VM UUID instead of VM ID
nvazquez May 18, 2022
92af98c
Apply suggestion
nvazquez May 18, 2022
9a42266
Refactor and fix start VM output
nvazquez May 18, 2022
7cda313
Use format instead of concatenation
nvazquez May 18, 2022
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
5 changes: 5 additions & 0 deletions engine/schema/src/main/java/com/cloud/vm/UserVmVO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.uservm.UserVm;
import org.apache.commons.lang3.StringUtils;

@Entity
@Table(name = "user_vm")
Expand Down Expand Up @@ -141,4 +142,8 @@ public void setUserVmType(String userVmType) {
public String getName() {
return instanceName;
}

public String getDisplayNameOrHostName() {
return StringUtils.isNotBlank(displayName) ? displayName : getHostName();
}
}
2 changes: 1 addition & 1 deletion server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public UserVmResponse newUserVmResponse(ResponseView view, String objectName, Us
userVmResponse.setName(userVm.getName());

if (userVm.getDisplayName() != null) {
userVmResponse.setDisplayName(userVm.getDisplayName());
userVmResponse.setDisplayName(userVm.getDisplayName());
} else {
userVmResponse.setDisplayName(userVm.getName());
}
Expand Down
10 changes: 8 additions & 2 deletions server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3130,6 +3130,11 @@ public UserVm rebootVirtualMachine(RebootVMCmd cmd) throws InsufficientCapacityE
throw new InvalidParameterValueException("Unable to find a virtual machine with id " + vmId);
}

if (vmInstance.getState() != State.Running) {
throw new InvalidParameterValueException(String.format("The VM %s (%s) is not running, unable to reboot it",
vmInstance.getUuid(), vmInstance.getDisplayNameOrHostName()));
}

_accountMgr.checkAccess(caller, null, true, vmInstance);

checkIfHostOfVMIsInPrepareForMaintenanceState(vmInstance.getHostId(), vmId, "Reboot");
Expand Down Expand Up @@ -5119,8 +5124,9 @@ public Pair<UserVmVO, Map<VirtualMachineProfile.Param, Object>> startVirtualMach
throw new InvalidParameterValueException("unable to find a virtual machine with id " + vmId);
}

if (vm.getState()== State.Running) {
throw new InvalidParameterValueException("The virtual machine "+ vm.getUuid()+ " ("+ vm.getDisplayName()+ ") is already running");
if (vm.getState() == State.Running) {
throw new InvalidParameterValueException(String.format("The virtual machine %s (%s) is already running",
vm.getUuid(), vm.getDisplayNameOrHostName()));
}

_accountMgr.checkAccess(callerAccount, null, true, vm);
Expand Down