Skip to content

Prevent NPE if hypervisor's capabilities are null #5029

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
yadvr merged 3 commits into from
May 21, 2021
Merged

Prevent NPE if hypervisor's capabilities are null #5029

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3435a76
Prevent NPE if hypervisor capabilies are null
slavkap May 18, 2021
e6f51c6
Added proper error msgs and reformat code
slavkap May 18, 2021
78c9aab
Change of the message when capabilities are not found
slavkap May 19, 2021
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
22 changes: 8 additions & 14 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 @@ -6201,22 +6201,16 @@ public VirtualMachine migrateVirtualMachineWithVolume(Long vmId, Host destinatio

HypervisorCapabilitiesVO capabilities = _hypervisorCapabilitiesDao.findByHypervisorTypeAndVersion(srcHost.getHypervisorType(), srcHost.getHypervisorVersion());

if (capabilities == null && HypervisorType.KVM.equals(srcHost.getHypervisorType())) {
List<HypervisorCapabilitiesVO> lstHypervisorCapabilities = _hypervisorCapabilitiesDao.listAllByHypervisorType(HypervisorType.KVM);

if (lstHypervisorCapabilities != null) {
for (HypervisorCapabilitiesVO hypervisorCapabilities : lstHypervisorCapabilities) {
if (hypervisorCapabilities.isStorageMotionSupported()) {
capabilities = hypervisorCapabilities;

break;
}
}
if (capabilities == null) {
if (!HypervisorType.KVM.equals(srcHost.getHypervisorType())) {
throw new CloudRuntimeException(String.format("Cannot migrate VM with storage, as the capabilities are not found for the hypervisor %s with version %s", srcHost.getHypervisorType(), srcHost.getHypervisorVersion()));
}
}
List<HypervisorCapabilitiesVO> lstHypervisorCapabilities = _hypervisorCapabilitiesDao.listAllByHypervisorType(HypervisorType.KVM);

if (!capabilities.isStorageMotionSupported()) {
throw new CloudRuntimeException("Migration with storage isn't supported on hypervisor " + srcHost.getHypervisorType() + " of version " + srcHost.getHypervisorVersion());
capabilities = lstHypervisorCapabilities.stream().filter(hvCapabilities -> hvCapabilities.isStorageMotionSupported()).findAny()
.orElseThrow(() -> new CloudRuntimeException(String.format("Cannot migrate VM with storage, as the capabilities are not found for the hypervisor %s with version %s", srcHost.getHypervisorType(), srcHost.getHypervisorVersion())));
} else if (!capabilities.isStorageMotionSupported()) {
throw new CloudRuntimeException(String.format("Migration with storage isn't supported on hypervisor %s of version %s", srcHost.getHypervisorType(), srcHost.getHypervisorVersion()));
}

// Check if destination host is up.
Expand Down