diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-01-07 08:47:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-07 08:47:34 +0100 |
commit | fad9a3d1557aa43598ffbed999f1ea20c8b711ac (patch) | |
tree | 0c08edc5c2360a92156dc4ab0491d5af3d51e49e | |
parent | bfa7764c54ab5040535d6fb856a2552a79e72491 (diff) | |
parent | 05bcbb8ddf3c051aa971cd792e164bd41e19d68d (diff) |
Merge pull request #15935 from vespa-engine/hakonhall/log-host-status-removals
Log host status removals
-rw-r--r-- | orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/HostInfosServiceImpl.java | 4 | ||||
-rw-r--r-- | orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkStatusService.java | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/HostInfosServiceImpl.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/HostInfosServiceImpl.java index d5cf0b39fda..61c9624cd6e 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/HostInfosServiceImpl.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/HostInfosServiceImpl.java @@ -105,6 +105,10 @@ public class HostInfosServiceImpl implements HostInfosService { @Override public void removeHosts(ApplicationInstanceReference reference, Set<HostName> hostnames) { ApplicationId application = OrchestratorUtil.toApplicationId(reference); + + // Needed for VESPA-18864: + log.info("Removing host status for " + application + ": " + hostnames); + // Remove /vespa/host-status/APPLICATION_ID/hosts/HOSTNAME hostnames.forEach(hostname -> curator.delete(Path.fromString(hostPath(application, hostname)))); } diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkStatusService.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkStatusService.java index a5877f4a761..a67991a4bf6 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkStatusService.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkStatusService.java @@ -22,7 +22,6 @@ import java.time.Duration; import java.time.Instant; import java.util.HashSet; import java.util.Map; -import java.util.Optional; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; |