apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bernardo De Marco Gonçalves 2025-04-09 09:20:51 -03:00 committed by GitHub
parent 5d5ac17c68
commit d32065fd38
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
framework/cluster/src/main/java/com/cloud/cluster/ClusterManagerImpl.java
View File

@ -1052,12 +1052,24 @@ public class ClusterManagerImpl extends ManagerBase implements ClusterManager, C
} }
if (_mshostId != null) { if (_mshostId != null) {
final ManagementServerHostVO mshost = _mshostDao.findByMsid(_msId); ManagementServerHostVO mshost = _mshostDao.findByMsid(_msId);
final ManagementServerStatusVO mshostStatus = mshostStatusDao.findByMsId(mshost.getUuid()); if (mshost != null) {
mshost.setState(ManagementServerHost.State.Down); ManagementServerStatusVO mshostStatus = mshostStatusDao.findByMsId(mshost.getUuid());
mshostStatus.setLastJvmStop(new Date()); if (mshostStatus != null) {
_mshostDao.update(_mshostId, mshost); mshost.setState(ManagementServerHost.State.Down);
mshostStatusDao.update(mshostStatus.getId(), mshostStatus); mshostStatus.setLastJvmStop(new Date());
_mshostDao.update(_mshostId, mshost);
mshostStatusDao.update(mshostStatus.getId(), mshostStatus);
} else {
s_logger.warn(String.format("Found a management server host [%s] without a status. This should never happen!", mshost));
mshostStatus = new ManagementServerStatusVO();
mshostStatus.setMsId(mshost.getUuid());
mshostStatus.setLastSystemBoot(new Date());
mshostStatus.setLastJvmStart(new Date());
mshostStatus.setUpdated(new Date());
mshostStatusDao.persist(mshostStatus);
}
}
} }
_heartbeatScheduler.shutdownNow(); _heartbeatScheduler.shutdownNow();