diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2019-01-17 13:38:16 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-01-22 12:17:32 +0100 |
commit | 1e3903b8fac15f1aa6ef2197846b36a92ef2e31b (patch) | |
tree | 3236d34753d979bf9f4d9a3e2b9a4af6aae2e413 /configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java | |
parent | 8372a883c5a5fa100f88fc9b80824359b5bb70cd (diff) |
Revert "Use JrtFactory to construct jrt supervisors in configserver"
This reverts commit 87ca5c6c4159ae5a7e44417e6624bd2d0ecb073d.
Diffstat (limited to 'configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java index 08767467fe6..f37225a7e7b 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/FileDistributionStatus.java @@ -1,16 +1,15 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.application; -import com.google.inject.Inject; import com.yahoo.component.AbstractComponent; import com.yahoo.concurrent.DaemonThreadFactory; import com.yahoo.config.model.api.PortInfo; import com.yahoo.config.model.api.ServiceInfo; -import com.yahoo.container.jdisc.jrt.JrtFactory; import com.yahoo.jrt.Request; import com.yahoo.jrt.Spec; import com.yahoo.jrt.Supervisor; import com.yahoo.jrt.Target; +import com.yahoo.jrt.Transport; import com.yahoo.log.LogLevel; import com.yahoo.slime.Cursor; import com.yahoo.vespa.config.server.http.JSONResponse; @@ -40,12 +39,7 @@ public class FileDistributionStatus extends AbstractComponent { enum Status {UNKNOWN, FINISHED, IN_PROGRESS} private final ExecutorService rpcExecutor = Executors.newCachedThreadPool(new DaemonThreadFactory("filedistribution status")); - private final Supervisor supervisor; - - @Inject - public FileDistributionStatus(JrtFactory jrtFactory) { - this.supervisor = jrtFactory.createSupervisor(); - } + private final Supervisor supervisor = new Supervisor(new Transport()); public StatusAllHosts status(Application application, Duration timeout) { List<HostStatus> hostStatuses = new ArrayList<>(); |