framework/cluster: fix NPE for ms-host status when mgr stops by yadvr · Pull Request #10500 · apache/cloudstack

yadvr · 2025-03-05T05:36:58Z

This handles an NPE case for when management server host status is not found in the DB, when stopping the cluster manager.

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?

On Mac OS, the stat collector doesn't run well as the code assumes to be running on Linux. On non-Linux env, this is easily reproducible.

This handles an NPE case for when management server host status is not found in the DB, when stopping the cluster manager. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

yadvr · 2025-03-05T05:37:28Z

@blueorangutan package

blueorangutan · 2025-03-05T05:38:09Z

@rohityadavcloud 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.

codecov · 2025-03-05T05:44:44Z

Codecov Report

Attention: Patch coverage is 0% with 11 lines in your changes missing coverage. Please review.

Project coverage is 16.17%. Comparing base (eab37ec) to head (ddd0f99).
Report is 44 commits behind head on main.

Files with missing lines	Patch %	Lines
...ain/java/com/cloud/cluster/ClusterManagerImpl.java	0.00%	11 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               main   #10500      +/-   ##
============================================
+ Coverage     16.15%   16.17%   +0.01%     
- Complexity    13274    13292      +18     
============================================
  Files          5666     5668       +2     
  Lines        498078   498187     +109     
  Branches      60267    60291      +24     
============================================
+ Hits          80481    80592     +111     
+ Misses       408584   408572      -12     
- Partials       9013     9023      +10

Flag	Coverage Δ
uitests	`3.99% <ø> (-0.01%)`	⬇️
unittests	`17.02% <0.00%> (+0.02%)`	⬆️

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.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

blueorangutan · 2025-03-05T06:34:56Z

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

yadvr · 2025-03-05T08:49:39Z

@blueorangutan package

blueorangutan · 2025-03-05T08:50:04Z

@rohityadavcloud 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.

weizhouapache

code lgtm

weizhouapache · 2025-03-05T08:56:23Z

it looks this issue exists for some years

blueorangutan · 2025-03-05T09:59:42Z

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

framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java

bernardodemarco

clgtm

bernardodemarco · 2025-03-05T12:03:18Z

@rohityadavcloud, I think we should also address this fix on 4.20:

cloudstack/framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java

Lines 1103 to 1110 in a841ed9

    
           if (_mshostId != null) { 
        
               final ManagementServerHostVO mshost = _mshostDao.findByMsid(_msId); 
        
               final ManagementServerStatusVO mshostStatus = mshostStatusDao.findByMsId(mshost.getUuid()); 
        
               mshost.setState(ManagementServerHost.State.Down); 
        
               mshostStatus.setLastJvmStop(new Date()); 
        
               _mshostDao.update(_mshostId, mshost); 
        
               mshostStatusDao.update(mshostStatus.getId(), mshostStatus); 
        
           }

What do you think?

yadvr · 2025-03-05T16:57:24Z

@bernardodemarco yes, I didn't send it on 4.20 branch as I reckon this affects devs (on non-Linux env) more than production users on Linux. But feel free to send a PR.

bernardodemarco · 2025-03-06T01:08:26Z

@bernardodemarco yes, I didn't send it on 4.20 branch as I reckon this affects devs (on non-Linux env) more than production users on Linux. But feel free to send a PR.

Ok, got it. So, after this one gets merged, I'll backport it to the 4.20 branch in a new PR

…erImpl.java Co-authored-by: dahn <daan.hoogland@gmail.com>

framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java

…erImpl.java

yadvr · 2025-03-07T02:57:23Z

@blueorangutan package

blueorangutan · 2025-03-07T02:58:03Z

@rohityadavcloud 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 · 2025-03-07T04:07:13Z

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

DaanHoogland

clgtm

bernardodemarco · 2025-04-02T18:45:47Z

@rohityadavcloud @weizhouapache @DaanHoogland, I've just opened a PR (#10653) to backport this one onto the 4.19 branch.

On #10500 (comment), I mentioned that I would backport it onto the 4.20 branch, however I think it's also worth it to include it on 4.19.

…r stops (#10653)

…10500) * framework/cluster: fix NPE for ms-host status when mgr stops This handles an NPE case for when management server host status is not found in the DB, when stopping the cluster manager. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> * Update framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java Co-authored-by: dahn <daan.hoogland@gmail.com> * Update framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java --------- Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> Co-authored-by: dahn <daan.hoogland@gmail.com>

…hen mgr stops (apache#10653)

framework/cluster: fix NPE for ms-host status when mgr stops

b3edd0e

This handles an NPE case for when management server host status is not found in the DB, when stopping the cluster manager. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

yadvr added this to the 4.21.0 milestone Mar 5, 2025

yadvr requested review from DaanHoogland and sureshanaparti March 5, 2025 05:37

weizhouapache approved these changes Mar 5, 2025

View reviewed changes

DaanHoogland reviewed Mar 5, 2025

View reviewed changes

framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java Show resolved Hide resolved

bernardodemarco approved these changes Mar 5, 2025

View reviewed changes

Update framework/cluster/src/main/java/com/cloud/cluster/ClusterManag…

94debbd

…erImpl.java Co-authored-by: dahn <daan.hoogland@gmail.com>

yadvr commented Mar 7, 2025

View reviewed changes

framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java Outdated Show resolved Hide resolved

Update framework/cluster/src/main/java/com/cloud/cluster/ClusterManag…

ddd0f99

…erImpl.java

DaanHoogland approved these changes Mar 7, 2025

View reviewed changes

yadvr merged commit f47bd61 into apache:main Mar 27, 2025
25 of 26 checks passed

yadvr deleted the npe-fix-cluster-mgr-stop branch March 27, 2025 11:17

bernardodemarco added a commit to bernardodemarco/cloudstack that referenced this pull request Apr 2, 2025

backport apache#10500

b3e1b23

bernardodemarco mentioned this pull request Apr 2, 2025

Backport #10500 framework/cluster: fix NPE for ms-host status when mgr stops #10653

Merged

14 tasks

weizhouapache pushed a commit that referenced this pull request Apr 9, 2025

backport #10500 framework/cluster: fix NPE for ms-host status when mg…

d32065f

…r stops (#10653)

sureshanaparti added this to Apache CloudStack 4.21.0 Jun 5, 2025

dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Jun 19, 2025

backport apache#10500 framework/cluster: fix NPE for ms-host status w…

7f69f8b

…hen mgr stops (apache#10653)

sureshanaparti moved this to Done in Apache CloudStack 4.21.0 Jul 14, 2025

Conversation

yadvr commented Mar 5, 2025

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

yadvr commented Mar 5, 2025

Uh oh!

blueorangutan commented Mar 5, 2025

Uh oh!

codecov bot commented Mar 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

blueorangutan commented Mar 5, 2025

Uh oh!

yadvr commented Mar 5, 2025

Uh oh!

blueorangutan commented Mar 5, 2025

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

weizhouapache commented Mar 5, 2025

Uh oh!

blueorangutan commented Mar 5, 2025

Uh oh!

Uh oh!

bernardodemarco left a comment

Choose a reason for hiding this comment

Uh oh!

bernardodemarco commented Mar 5, 2025

Uh oh!

yadvr commented Mar 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bernardodemarco commented Mar 6, 2025

Uh oh!

Uh oh!

yadvr commented Mar 7, 2025

Uh oh!

blueorangutan commented Mar 7, 2025

Uh oh!

blueorangutan commented Mar 7, 2025

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

bernardodemarco commented Apr 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov bot commented Mar 5, 2025 •

edited

Loading

yadvr commented Mar 5, 2025 •

edited

Loading

bernardodemarco commented Apr 2, 2025 •

edited

Loading