aboutsummaryrefslogtreecommitdiffstats
path: root/orchestrator
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2021-09-10 10:52:27 +0200
committerGitHub <noreply@github.com>2021-09-10 10:52:27 +0200
commitdc4fd3d892d799cee3016f04f134bd1baa5c9ce6 (patch)
tree3e68390f4133a4853b5d6b2c6c63da2962f4d481 /orchestrator
parent34adf677b98abd47a2c75f43287878ac8ccef8fc (diff)
parent38c91c4787babbc546c0971d0836253fc8ee4b82 (diff)
Merge pull request #19060 from vespa-engine/hakonhall/remove-orchestrate-missing-proxies-flag
Remove orchestrate-missing-proxies flag
Diffstat (limited to 'orchestrator')
-rw-r--r--orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java8
1 files changed, 1 insertions, 7 deletions
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 061b3f706a5..7090322f3cf 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java
@@ -86,17 +86,11 @@ public class OrchestratorImpl implements Orchestrator {
zone,
Clock.systemUTC(),
new ApplicationApiFactory(configServerConfig.zookeeperserver().size(),
- resolveNumProxies(orchestratorConfig, flagSource),
+ orchestratorConfig.numProxies(),
Clock.systemUTC()),
orchestratorConfig.serviceMonitorConvergenceLatencySeconds());
}
- private static int resolveNumProxies(OrchestratorConfig orchestratorConfig, FlagSource flagSource) {
- return Flags.ORCHESTRATE_MISSING_PROXIES.bindTo(flagSource).value() ?
- orchestratorConfig.numProxies() :
- 0;
- }
-
private OrchestratorImpl(ClusterControllerClientFactory clusterControllerClientFactory,
StatusService statusService,
ServiceMonitor serviceMonitor,