Skip to content

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

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
rohityadavcloud merged 3 commits into from
Mar 27, 2025
Merged

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

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3edd0e
framework/cluster: fix NPE for ms-host status when mgr stops
rohityadavcloud Mar 5, 2025
94debbd
Update framework/cluster/src/main/java/com/cloud/cluster/ClusterManag…
rohityadavcloud Mar 7, 2025
ddd0f99
Update framework/cluster/src/main/java/com/cloud/cluster/ClusterManag…
rohityadavcloud Mar 7, 2025
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
15 changes: 12 additions & 3 deletions framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,9 +1107,18 @@
if (_mshostId != null) {
final ManagementServerHostVO mshost = _mshostDao.findByMsid(_msId);
if (mshost != null) {
final ManagementServerStatusVO mshostStatus = mshostStatusDao.findByMsId(mshost.getUuid());
mshostStatus.setLastJvmStop(new Date());
mshostStatusDao.update(mshostStatus.getId(), mshostStatus);
ManagementServerStatusVO mshostStatus = mshostStatusDao.findByMsId(mshost.getUuid());

Check warning on line 1110 in framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java

View check run for this annotation

Codecov / codecov/patch

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

Added line #L1110 was not covered by tests
if (mshostStatus != null) {
mshostStatus.setLastJvmStop(new Date());
mshostStatusDao.update(mshostStatus.getId(), mshostStatus);

Check warning on line 1113 in framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java

View check run for this annotation

Codecov / codecov/patch

framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java#L1112-L1113 

Added lines #L1112 - L1113 were not covered by tests
} else {
mshostStatus = new ManagementServerStatusVO();
mshostStatus.setMsId(mshost.getUuid());
mshostStatus.setLastSystemBoot(new Date());
mshostStatus.setLastJvmStart(new Date());
mshostStatus.setUpdated(new Date());
mshostStatusDao.persist(mshostStatus);

Check warning on line 1120 in framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java

View check run for this annotation

Codecov / codecov/patch

framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java#L1115-L1120 

Added lines #L1115 - L1120 were not covered by tests
}

ManagementServerHost.State msHostState = ManagementServerHost.State.Down;
if (ManagementServerHost.State.Maintenance.equals(mshost.getState()) || ManagementServerHost.State.PreparingForMaintenance.equals(mshost.getState())) {
Expand Down