Fix NPE issues during host rolling maintenance, due to host tags and custom constrained/unconstrained service offering #9844

sureshanaparti · 2024-10-23T11:37:06Z

Description

This PR fixes NPE issues during host rolling maintenance, due to host tags and custom constrained/unconstrained service offering.

Fixes #9834 & #9836

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)
build/CI
test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

Tested host rolling maintenance with custom constrained/unconstrained service offering & service offering without host tags, checked the rolling maintenance cmd sent to KVM host without any NPEs.

How did you try to break this feature and the system with this change?

…custom constrained/unconstrained service offering

sureshanaparti · 2024-10-23T11:40:30Z

@blueorangutan package

codecov · 2024-10-23T11:45:01Z

Codecov Report

Attention: Patch coverage is 45.45455% with 18 lines in your changes missing coverage. Please review.

Project coverage is 15.11%. Comparing base (175eed2) to head (e5e60d8).
Report is 1 commits behind head on 4.19.

Files with missing lines	Patch %	Lines
.../cloud/resource/RollingMaintenanceManagerImpl.java	45.45%	13 Missing and 5 partials ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               4.19    #9844      +/-   ##
============================================
+ Coverage     15.08%   15.11%   +0.02%     
- Complexity    11203    11226      +23     
============================================
  Files          5404     5404              
  Lines        473423   473453      +30     
  Branches      59987    61557    +1570     
============================================
+ Hits          71429    71567     +138     
+ Misses       394044   393881     -163     
- Partials       7950     8005      +55

Flag	Coverage Δ
uitests	`4.30% <ø> (ø)`
unittests	`15.83% <45.45%> (+0.03%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

sureshanaparti · 2024-10-23T11:53:06Z

@blueorangutan package

blueorangutan · 2024-10-23T11:54:07Z

@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2024-10-23T12:49:43Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 11417

sureshanaparti · 2024-10-24T09:57:50Z

@blueorangutan test

blueorangutan · 2024-10-24T10:00:03Z

@sureshanaparti a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

blueorangutan · 2024-10-24T23:48:18Z

[SF] Trillian test result (tid-11695)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 47478 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9844-t11695-kvm-ol8.zip
Smoke tests completed. 132 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_03_secured_to_nonsecured_vm_migration	`Error`	441.17	test_vm_life_cycle.py

vishesh92

clgtm. didn't test

DaanHoogland

clgtm

server/src/main/java/com/cloud/resource/RollingMaintenanceManagerImpl.java

borisstoyanov

LGTM, following the steps I couldn't reproduce

sureshanaparti · 2024-11-05T15:51:11Z

@blueorangutan package

blueorangutan · 2024-11-05T15:52:04Z

@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2024-11-05T16:31:24Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✖️ debian ✔️ suse15. SL-JID 11510

sureshanaparti · 2024-11-06T04:38:47Z

@blueorangutan package

blueorangutan · 2024-11-06T04:40:03Z

@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2024-11-06T06:02:41Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 11515

harikrishna-patnala

code LGTM

rohityadavcloud · 2024-11-07T09:05:40Z

@blueorangutan test

blueorangutan · 2024-11-07T09:08:05Z

@rohityadavcloud a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

blueorangutan · 2024-11-07T22:15:45Z

[SF] Trillian test result (tid-11759)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 44924 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9844-t11759-kvm-ol8.zip
Smoke tests completed. 133 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

JoaoJandre · 2024-11-08T11:26:57Z

server/src/main/java/com/cloud/resource/RollingMaintenanceManagerImpl.java

+        if (serviceOffering.isDynamic()) {
+            List<UserVmDetailVO> vmDetails = userVmDetailsDao.listDetails(runningVM.getId());
+            if (CollectionUtils.isNotEmpty(vmDetails)) {
+                for (UserVmDetailVO vmDetail : vmDetails) {
+                    if (vmDetail.getName() != null && vmDetail.getValue() != null) {
+                        if (cpu == null && VmDetailConstants.CPU_NUMBER.equals(vmDetail.getName())) {
+                            cpu = Integer.valueOf(vmDetail.getValue());
+                        } else if (speed == null && VmDetailConstants.CPU_SPEED.equals(vmDetail.getName())) {
+                            speed = Integer.valueOf(vmDetail.getValue());
+                        } else if (ramSize == null && VmDetailConstants.MEMORY.equals(vmDetail.getName())) {
+                            ramSize = Integer.valueOf(vmDetail.getValue());
+                        }
+                    }
+                }
+            }
+        }


Suggested change

if (serviceOffering.isDynamic()) {

List<UserVmDetailVO> vmDetails = userVmDetailsDao.listDetails(runningVM.getId());

if (CollectionUtils.isNotEmpty(vmDetails)) {

for (UserVmDetailVO vmDetail : vmDetails) {

if (vmDetail.getName() != null && vmDetail.getValue() != null) {

if (cpu == null && VmDetailConstants.CPU_NUMBER.equals(vmDetail.getName())) {

cpu = Integer.valueOf(vmDetail.getValue());

} else if (speed == null && VmDetailConstants.CPU_SPEED.equals(vmDetail.getName())) {

speed = Integer.valueOf(vmDetail.getValue());

} else if (ramSize == null && VmDetailConstants.MEMORY.equals(vmDetail.getName())) {

ramSize = Integer.valueOf(vmDetail.getValue());

}

}

}

}

}

if (!serviceOffering.isDynamic()) {

return new Ternary<>(cpu, speed, ramSize);

}

List<UserVmDetailVO> vmDetails = userVmDetailsDao.listDetails(runningVM.getId());

if (CollectionUtils.isEmpty(vmDetails)) {

return new Ternary<>(cpu, speed, ramSize);

}

for (UserVmDetailVO vmDetail : vmDetails) {

if (vmDetail.getName() != null && vmDetail.getValue() != null) {

if (cpu == null && VmDetailConstants.CPU_NUMBER.equals(vmDetail.getName())) {

cpu = Integer.valueOf(vmDetail.getValue());

} else if (speed == null && VmDetailConstants.CPU_SPEED.equals(vmDetail.getName())) {

speed = Integer.valueOf(vmDetail.getValue());

} else if (ramSize == null && VmDetailConstants.MEMORY.equals(vmDetail.getName())) {

ramSize = Integer.valueOf(vmDetail.getValue());

}

}

}

It's probably something we can deal in a separate PR? cc @sureshanaparti

Its a very simple change for readability, do we really need another PR for it?

Fix NPE issues during host rolling maintenance, due to host tags and …

89ae8c1

…custom constrained/unconstrained service offering

This was linked to issues Oct 23, 2024

NPE during host rolling maintenance when host has VMs with custom constrained/unconstrained service offering #9836

Open

NPE during host rolling maintenance when host has tag and service offering doesn't have host tag #9834

Open

sureshanaparti requested review from nvazquez and vishesh92 October 23, 2024 11:40

sureshanaparti added this to the 4.19.2.0 milestone Oct 23, 2024

vishesh92 approved these changes Oct 25, 2024

View reviewed changes

DaanHoogland approved these changes Oct 28, 2024

View reviewed changes

server/src/main/java/com/cloud/resource/RollingMaintenanceManagerImpl.java Outdated Show resolved Hide resolved

JoaoJandre reviewed Oct 30, 2024

View reviewed changes

borisstoyanov self-assigned this Nov 1, 2024

borisstoyanov approved these changes Nov 1, 2024

View reviewed changes

review comments & tests

e5e60d8

sureshanaparti requested a review from JoaoJandre November 5, 2024 15:51

harikrishna-patnala approved these changes Nov 7, 2024

View reviewed changes

JoaoJandre reviewed Nov 8, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix NPE issues during host rolling maintenance, due to host tags and custom constrained/unconstrained service offering #9844

Fix NPE issues during host rolling maintenance, due to host tags and custom constrained/unconstrained service offering #9844

sureshanaparti commented Oct 23, 2024 •

edited

Loading

sureshanaparti commented Oct 23, 2024

codecov bot commented Oct 23, 2024 •

edited

Loading

sureshanaparti commented Oct 23, 2024

blueorangutan commented Oct 23, 2024

blueorangutan commented Oct 23, 2024

sureshanaparti commented Oct 24, 2024

blueorangutan commented Oct 24, 2024

blueorangutan commented Oct 24, 2024

vishesh92 left a comment

DaanHoogland left a comment

borisstoyanov left a comment

sureshanaparti commented Nov 5, 2024

blueorangutan commented Nov 5, 2024

blueorangutan commented Nov 5, 2024

sureshanaparti commented Nov 6, 2024

blueorangutan commented Nov 6, 2024

blueorangutan commented Nov 6, 2024

harikrishna-patnala left a comment

rohityadavcloud commented Nov 7, 2024

blueorangutan commented Nov 7, 2024

blueorangutan commented Nov 7, 2024

JoaoJandre Nov 8, 2024

rohityadavcloud Nov 14, 2024

JoaoJandre Nov 14, 2024

Fix NPE issues during host rolling maintenance, due to host tags and custom constrained/unconstrained service offering #9844

Are you sure you want to change the base?

Fix NPE issues during host rolling maintenance, due to host tags and custom constrained/unconstrained service offering #9844

Conversation

sureshanaparti commented Oct 23, 2024 • edited Loading

Description

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?

sureshanaparti commented Oct 23, 2024

codecov bot commented Oct 23, 2024 • edited Loading

Codecov Report

sureshanaparti commented Oct 23, 2024

blueorangutan commented Oct 23, 2024

blueorangutan commented Oct 23, 2024

sureshanaparti commented Oct 24, 2024

blueorangutan commented Oct 24, 2024

blueorangutan commented Oct 24, 2024

vishesh92 left a comment

Choose a reason for hiding this comment

DaanHoogland left a comment

Choose a reason for hiding this comment

borisstoyanov left a comment

Choose a reason for hiding this comment

sureshanaparti commented Nov 5, 2024

blueorangutan commented Nov 5, 2024

blueorangutan commented Nov 5, 2024

sureshanaparti commented Nov 6, 2024

blueorangutan commented Nov 6, 2024

blueorangutan commented Nov 6, 2024

harikrishna-patnala left a comment

Choose a reason for hiding this comment

rohityadavcloud commented Nov 7, 2024

blueorangutan commented Nov 7, 2024

blueorangutan commented Nov 7, 2024

JoaoJandre Nov 8, 2024

Choose a reason for hiding this comment

rohityadavcloud Nov 14, 2024

Choose a reason for hiding this comment

JoaoJandre Nov 14, 2024

Choose a reason for hiding this comment

sureshanaparti commented Oct 23, 2024 •

edited

Loading

codecov bot commented Oct 23, 2024 •

edited

Loading