diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2021-09-10 10:52:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-10 10:52:27 +0200 |
| commit | dc4fd3d892d799cee3016f04f134bd1baa5c9ce6 (patch) | |
| tree | 3e68390f4133a4853b5d6b2c6c63da2962f4d481 | |
| parent | 34adf677b98abd47a2c75f43287878ac8ccef8fc (diff) | |
| parent | 38c91c4787babbc546c0971d0836253fc8ee4b82 (diff) | |
Merge pull request #19060 from vespa-engine/hakonhall/remove-orchestrate-missing-proxies-flag
Remove orchestrate-missing-proxies flag
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 6 | ||||
| -rw-r--r-- | orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java | 8 |
2 files changed, 1 insertions, 13 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index 9e83a43212e..11cfbab66f7 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -130,12 +130,6 @@ public class Flags { "Takes effect at redeployment", ZONE_ID, APPLICATION_ID); - public static final UnboundBooleanFlag ORCHESTRATE_MISSING_PROXIES = defineFeatureFlag( - "orchestrate-missing-proxies", true, - List.of("hakonhall"), "2021-08-05", "2021-10-05", - "Whether the Orchestrator can assume any missing proxy services are down.", - "Takes effect on first (re)start of config server"); - public static final UnboundIntFlag NUM_DEPLOY_HELPER_THREADS = defineIntFlag( "num-model-builder-threads", 0, List.of("balder"), "2021-09-09", "2021-10-01", 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, |