apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Shutdown MS maintenance jobs when finished (#11330)

Browse Source
This commit is contained in:
Suresh Kumar Anaparti 2025-07-31 10:00:29 +05:30 committed by GitHub
parent 70468a6258
commit 712492230a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent/src/main/java/com/cloud/agent/Agent.java
View File

@ -968,9 +968,11 @@ public class Agent implements HandlerFactory, IAgentControl, AgentStatusUpdater
if (CollectionUtils.isNotEmpty(cmd.getMsList())) { if (CollectionUtils.isNotEmpty(cmd.getMsList())) {
processManagementServerList(cmd.getMsList(), cmd.getAvoidMsList(), cmd.getLbAlgorithm(), cmd.getLbCheckInterval(), false); processManagementServerList(cmd.getMsList(), cmd.getAvoidMsList(), cmd.getLbAlgorithm(), cmd.getLbCheckInterval(), false);
} }
Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("MigrateAgentConnection-Job")).schedule(() -> { ScheduledExecutorService migrateAgentConnectionService = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("MigrateAgentConnection-Job"));
migrateAgentConnectionService.schedule(() -> {
migrateAgentConnection(cmd.getAvoidMsList()); migrateAgentConnection(cmd.getAvoidMsList());
}, 3, TimeUnit.SECONDS); }, 3, TimeUnit.SECONDS);
migrateAgentConnectionService.shutdown();
} catch (Exception e) { } catch (Exception e) {
String errMsg = "Migrate agent connection failed, due to " + e.getMessage(); String errMsg = "Migrate agent connection failed, due to " + e.getMessage();
logger.debug(errMsg, e); logger.debug(errMsg, e);

3
plugins/maintenance/src/main/java/org/apache/cloudstack/maintenance/ManagementServerMaintenanceManagerImpl.java
View File

@ -622,6 +622,7 @@ public class ManagementServerMaintenanceManagerImpl extends ManagerBase implemen
ManagementServerHostVO msHost = msHostDao.findByMsid(ManagementServerNode.getManagementServerId()); ManagementServerHostVO msHost = msHostDao.findByMsid(ManagementServerNode.getManagementServerId());
if (msHost == null) { if (msHost == null) {
logger.warn("Unable to find the management server, invalid node id"); logger.warn("Unable to find the management server, invalid node id");
managementServerMaintenanceManager.cancelWaitForPendingJobs();
return; return;
} }
msHostDao.updateState(msHost.getId(), State.Maintenance); msHostDao.updateState(msHost.getId(), State.Maintenance);
@ -658,6 +659,7 @@ public class ManagementServerMaintenanceManagerImpl extends ManagerBase implemen
ManagementServerHostVO msHost = msHostDao.findByMsid(ManagementServerNode.getManagementServerId()); ManagementServerHostVO msHost = msHostDao.findByMsid(ManagementServerNode.getManagementServerId());
if (msHost == null) { if (msHost == null) {
logger.warn("Unable to find the management server, invalid node id"); logger.warn("Unable to find the management server, invalid node id");
managementServerMaintenanceManager.cancelWaitForPendingJobs();
return; return;
} }
if (totalAgents == 0) { if (totalAgents == 0) {
@ -693,6 +695,7 @@ public class ManagementServerMaintenanceManagerImpl extends ManagerBase implemen
ManagementServerHostVO msHost = msHostDao.findByMsid(ManagementServerNode.getManagementServerId()); ManagementServerHostVO msHost = msHostDao.findByMsid(ManagementServerNode.getManagementServerId());
if (msHost == null) { if (msHost == null) {
logger.warn("Unable to find the management server, invalid node id"); logger.warn("Unable to find the management server, invalid node id");
managementServerMaintenanceManager.cancelWaitForPendingJobs();
return; return;
} }
msHostDao.updateState(msHost.getId(), State.ReadyToShutDown); msHostDao.updateState(msHost.getId(), State.ReadyToShutDown);