diff options
| author | Martin Polden <mpolden@mpolden.no> | 2020-06-25 09:09:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-25 09:09:52 +0200 |
| commit | a979e89b4c4f96c2ddcbd03509b84cb6e0d6812c (patch) | |
| tree | 74ab0e77275ee9278554f519517620a16df278b6 /node-repository | |
| parent | 1b7958527aa2cc2289f556b8b1dde954a9b581f8 (diff) | |
| parent | f4ca256a00d397de7edba60246634b00b7f9830d (diff) | |
Merge pull request #13682 from vespa-engine/mpolden/remove-flag
Remove configserver-provision-lb flag
Diffstat (limited to 'node-repository')
2 files changed, 1 insertions, 5 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java index bb25e8371a2..e710d70f20f 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java @@ -50,14 +50,12 @@ public class LoadBalancerProvisioner { private final NodeRepository nodeRepository; private final CuratorDatabaseClient db; private final LoadBalancerService service; - private final BooleanFlag provisionConfigServerLoadBalancer; private final BooleanFlag provisionControllerLoadBalancer; public LoadBalancerProvisioner(NodeRepository nodeRepository, LoadBalancerService service, FlagSource flagSource) { this.nodeRepository = nodeRepository; this.db = nodeRepository.database(); this.service = service; - this.provisionConfigServerLoadBalancer = Flags.CONFIGSERVER_PROVISION_LB.bindTo(flagSource); this.provisionControllerLoadBalancer = Flags.CONTROLLER_PROVISION_LB.bindTo(flagSource); // Read and write all load balancers to make sure they are stored in the latest version of the serialization format for (var id : db.readLoadBalancerIds()) { @@ -149,11 +147,10 @@ public class LoadBalancerProvisioner { db.writeLoadBalancers(deactivatedLoadBalancers, transaction); } - // TODO(mpolden): Inline when feature flags are removed + // TODO(mpolden): Inline when feature flag is removed private boolean canForwardTo(NodeType type, ClusterSpec cluster) { boolean canForwardTo = service.canForwardTo(type, cluster.type()); if (canForwardTo) { - if (type == NodeType.config) return provisionConfigServerLoadBalancer.value(); if (type == NodeType.controller) return provisionControllerLoadBalancer.value(); } return canForwardTo; diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java index b4a1a4afe9b..29a121b8a21 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisionerTest.java @@ -217,7 +217,6 @@ public class LoadBalancerProvisionerTest { @Test public void provision_load_balancer_config_server_cluster() { - flagSource.withBooleanFlag(Flags.CONFIGSERVER_PROVISION_LB.id(), true); ApplicationId configServerApp = ApplicationId.from("hosted-vespa", "zone-config-servers", "default"); Supplier<List<LoadBalancer>> lbs = () -> tester.nodeRepository().loadBalancers(configServerApp).asList(); var cluster = ClusterSpec.Id.from("zone-config-servers"); |