From 661dfc4fb0c59bc42cc43407604cf5c23ca50471 Mon Sep 17 00:00:00 2001 From: William Hou Date: Mon, 24 Jan 2022 14:16:08 -0500 Subject: [PATCH] fix npe from tasks with null hostnames from resources from decommissioned hosts --- .../mesos/SingularityAgentAndRackManager.java | 13 +------------ .../singularity/mesos/SingularityStartup.java | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/SingularityService/src/main/java/com/hubspot/singularity/mesos/SingularityAgentAndRackManager.java b/SingularityService/src/main/java/com/hubspot/singularity/mesos/SingularityAgentAndRackManager.java index 347cade3a5..17245bfff6 100644 --- a/SingularityService/src/main/java/com/hubspot/singularity/mesos/SingularityAgentAndRackManager.java +++ b/SingularityService/src/main/java/com/hubspot/singularity/mesos/SingularityAgentAndRackManager.java @@ -800,18 +800,7 @@ public void checkDecommissionedAgentsFromMaster( for (MesosMasterAgentObject agentJsonObject : state.getAgents()) { String agentId = agentJsonObject.getId(); - if (agentsById.containsKey(agentId)) { - SingularityAgent agent = agentsById.get(agentId); - if (agent != null) { - LOG.info( - "Found resources ({}) for decommissioned agent {}", - agentJsonObject.getResources(), - agent - ); - agentManager.saveObject(agent.withResources(agentJsonObject.getResources())); - } - agentsById.remove(agentId); - } + agentsById.remove(agentId); } for (SingularityAgent leftOverAgent : agentsById.values()) { diff --git a/SingularityService/src/main/java/com/hubspot/singularity/mesos/SingularityStartup.java b/SingularityService/src/main/java/com/hubspot/singularity/mesos/SingularityStartup.java index be54d9d9b4..db82182ede 100644 --- a/SingularityService/src/main/java/com/hubspot/singularity/mesos/SingularityStartup.java +++ b/SingularityService/src/main/java/com/hubspot/singularity/mesos/SingularityStartup.java @@ -108,8 +108,8 @@ public void startup(MasterInfo masterInfo) { MesosMasterStateObject state = mesosClient.getMasterState(uri); - agentAndRackManager.loadAgentsAndRacksFromMaster(state, true); agentAndRackManager.checkDecommissionedAgentsFromMaster(state, true); + agentAndRackManager.loadAgentsAndRacksFromMaster(state, true); ExecutorService startupExecutor = Executors.newFixedThreadPool( configuration.getSchedulerStartupConcurrency(),