diff options
| author | Harald Musum <musum@verizonmedia.com> | 2019-03-19 15:55:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-19 15:55:53 +0100 |
| commit | 3ecb6309e876747e84d26543feefc2c5ae1a458e (patch) | |
| tree | 80746e95c6ba698a984acd9d5f112342037aa383 | |
| parent | 43b44b6d1fba5c5c7eb982716119bf37aeeb7604 (diff) | |
| parent | 68e11df6138a3de7c6b3c01e3aeb7d3956d234ab (diff) | |
Merge pull request #8830 from vespa-engine/hmusum/check-for-both-service-types-when-getting-logs
Check for both service types when getting container on logserver host
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java index 62103b51eaa..c4b1d0f7c86 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java @@ -12,6 +12,7 @@ import com.yahoo.config.application.api.ApplicationMetaData; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.model.api.HostInfo; import com.yahoo.config.model.api.ServiceInfo; +import com.yahoo.config.model.api.container.ContainerServiceType; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.HostFilter; @@ -75,6 +76,8 @@ import java.util.logging.Logger; import java.util.stream.Collectors; import static com.yahoo.config.model.api.container.ContainerServiceType.CLUSTERCONTROLLER_CONTAINER; +import static com.yahoo.config.model.api.container.ContainerServiceType.CONTAINER; +import static com.yahoo.config.model.api.container.ContainerServiceType.LOGSERVER_CONTAINER; import static java.nio.file.Files.readAttributes; /** @@ -704,7 +707,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye .findFirst().orElseThrow(() -> new IllegalArgumentException("Could not find HostInfo for LogServer")); ServiceInfo containerServiceInfo = logServerHostInfo.getServices().stream() - .filter(service -> service.getServiceType().equals("container")) + .filter(service -> List.of(LOGSERVER_CONTAINER.serviceName, CONTAINER.serviceName).contains(service.getServiceType())) .findFirst().orElseThrow(() -> new IllegalArgumentException("No container running on logserver host")); int port = containerServiceInfo.getPorts().stream() |