diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2020-01-27 09:02:22 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2020-01-27 09:02:22 +0100 |
commit | 239072ab7ffa48949c06dae505b92cadfb6fccf1 (patch) | |
tree | ea38534deb61fea5307cff4a6496f603bbe5630d /orchestrator | |
parent | e2785c3b4ec751cbf3a62640677ed9ea4295a0ec (diff) |
Pull host info through out of orchestrator and through nodes response
Diffstat (limited to 'orchestrator')
-rw-r--r-- | orchestrator/src/main/java/com/yahoo/vespa/orchestrator/Orchestrator.java | 3 | ||||
-rw-r--r-- | orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/Orchestrator.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/Orchestrator.java index 59b320cf501..d1331b70251 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/Orchestrator.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/Orchestrator.java @@ -7,6 +7,7 @@ import com.yahoo.vespa.orchestrator.model.NodeGroup; import com.yahoo.vespa.orchestrator.policy.BatchHostStateChangeDeniedException; import com.yahoo.vespa.orchestrator.policy.HostStateChangeDeniedException; import com.yahoo.vespa.orchestrator.status.ApplicationInstanceStatus; +import com.yahoo.vespa.orchestrator.status.HostInfo; import com.yahoo.vespa.orchestrator.status.HostStatus; import java.util.List; @@ -54,7 +55,7 @@ public interface Orchestrator { * Prefer this to {@link #getNodeStatus(HostName)} when consistency is not required, and when doing bulk reads. * @return a mapping from host names to their statuses. Unknown hosts map to {@code Optional.empty()}. */ - Function<HostName, Optional<HostStatus>> getNodeStatuses(); + Function<HostName, Optional<HostInfo>> getNodeStatuses(); void setNodeStatus(HostName hostName, HostStatus state) throws OrchestrationException; diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java index c9d234893cb..f0b7c2eead1 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java @@ -27,6 +27,7 @@ import com.yahoo.vespa.orchestrator.policy.HostedVespaClusterPolicy; import com.yahoo.vespa.orchestrator.policy.HostedVespaPolicy; import com.yahoo.vespa.orchestrator.policy.Policy; import com.yahoo.vespa.orchestrator.status.ApplicationInstanceStatus; +import com.yahoo.vespa.orchestrator.status.HostInfo; import com.yahoo.vespa.orchestrator.status.HostStatus; import com.yahoo.vespa.orchestrator.status.MutableStatusRegistry; import com.yahoo.vespa.orchestrator.status.StatusService; @@ -112,11 +113,9 @@ public class OrchestratorImpl implements Orchestrator { } @Override - public Function<HostName, Optional<HostStatus>> getNodeStatuses() { - Function<ApplicationInstanceReference, Set<HostName>> suspendedHosts = statusService.getSuspendedHostsByApplication(); + public Function<HostName, Optional<HostInfo>> getNodeStatuses() { return hostName -> instanceLookupService.findInstanceByHost(hostName) - .map(application -> suspendedHosts.apply(application.reference()).contains(hostName) - ? HostStatus.ALLOWED_TO_BE_DOWN : HostStatus.NO_REMARKS); + .map(application -> statusService.getHostInfo(application.reference(), hostName)); } @Override |