server: fix NPE when migrate vm away with volumes#13131
Draft
weizhouapache wants to merge 1 commit intoapache:4.20from
Draft
server: fix NPE when migrate vm away with volumes#13131weizhouapache wants to merge 1 commit intoapache:4.20from
weizhouapache wants to merge 1 commit intoapache:4.20from
Conversation
weizhouapache
changed the title
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## 4.20 #13131 +/- ##
============================================
- Coverage 16.27% 16.26% -0.01%
+ Complexity 13440 13438 -2
============================================
Files 5665 5665
Lines 500555 500555
Branches 60789 60789
============================================
- Hits 81445 81438 -7
- Misses 410004 410012 +8
+ Partials 9106 9105 -1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes a NullPointerException during host maintenance VM migration when the VM uses a customized/dynamic compute offering (where service_offering.cpu/ram_size may be NULL) by fetching the VM-specific computed service offering.
Changes:
- Use the
ServiceOfferingDao.findById(vmId, offeringId)overload when migrating a VM away with volumes so dynamic offering values are populated fromuser_vm_details.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
1466
to
1468
| final DataCenterDeployment plan = new DataCenterDeployment(host.getDataCenterId(), host.getPodId(), host.getClusterId(), null, null, null); | ||
| ServiceOfferingVO offeringVO = serviceOfferingDao.findById(vm.getServiceOfferingId()); | ||
| ServiceOfferingVO offeringVO = serviceOfferingDao.findById(vm.getId(), vm.getServiceOfferingId()); | ||
| final VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm, null, offeringVO, null, null); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR fixes #13130
Types of changes
Feature/Enhancement Scale or Bug Severity
Feature/Enhancement Scale
Bug Severity
Screenshots (if appropriate):
How Has This Been Tested?
How did you try to break this feature and the system with this change?