Merge pull request #21772 from vespa-engine/freva/simplify-shared-lbs

Simplify shared load balancer service

7 files changed, 11 insertions, 45 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerService.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerService.java
index 7dbebd1fc47..1345dfb8e65 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerService.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerService.java
@@ -5,16 +5,10 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.HostName;
 import com.yahoo.config.provision.NodeType;
-import com.yahoo.vespa.hosted.provision.Node;
-import com.yahoo.vespa.hosted.provision.NodeList;
-import com.yahoo.vespa.hosted.provision.NodeRepository;
-import com.yahoo.vespa.hosted.provision.node.IP;
 
-import java.util.Comparator;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * This implementation of {@link LoadBalancerService} returns the load balancer(s) that exists by default in the shared
@@ -27,28 +21,18 @@ import java.util.stream.Collectors;
  */
 public class SharedLoadBalancerService implements LoadBalancerService {
 
-    private static final Comparator<Node> hostnameComparator = Comparator.comparing(Node::hostname);
-
-    private final NodeRepository nodeRepository;
     private final String vipHostname;
 
-    public SharedLoadBalancerService(NodeRepository nodeRepository, String vipHostname) {
-        this.nodeRepository = Objects.requireNonNull(nodeRepository);
+    public SharedLoadBalancerService(String vipHostname) {
         this.vipHostname = Objects.requireNonNull(vipHostname);
     }
 
     @Override
     public LoadBalancerInstance create(LoadBalancerSpec spec, boolean force) {
-        NodeList proxyNodes = nodeRepository.nodes().list().nodeType(NodeType.proxy).sortedBy(hostnameComparator);
-        if (proxyNodes.isEmpty()) throw new IllegalStateException("No proxy nodes found in node-repository");
-        Set<String> networks = proxyNodes.stream()
-                                         .flatMap(node -> node.ipConfig().primary().stream())
-                                         .map(SharedLoadBalancerService::withPrefixLength)
-                                         .collect(Collectors.toSet());
         return new LoadBalancerInstance(HostName.from(vipHostname),
                                         Optional.empty(),
-                                        Set.of(4080, 4443),
-                                        networks,
+                                        Set.of(4443),
+                                        Set.of(),
                                         spec.reals());
     }
 
@@ -68,11 +52,4 @@ public class SharedLoadBalancerService implements LoadBalancerService {
         return nodeType == NodeType.tenant && clusterType.isContainer();
     }
 
-    private static String withPrefixLength(String address) {
-        if (IP.isV6(address)) {
-            return address + "/128";
-        }
-        return address + "/32";
-    }
-
 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java
index 15decde0d7c..2d36108a1a6 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java
@@ -66,7 +66,7 @@ public class NodeRepositoryMaintenance extends AbstractComponent {
         maintainers.add(new ScalingSuggestionsMaintainer(nodeRepository, defaults.scalingSuggestionsInterval, metric));
         maintainers.add(new SwitchRebalancer(nodeRepository, defaults.switchRebalancerInterval, metric, deployer));
 
-        provisionServiceProvider.getLoadBalancerService(nodeRepository)
+        provisionServiceProvider.getLoadBalancerService()
                                 .map(lbService -> new LoadBalancerExpirer(nodeRepository, defaults.loadBalancerExpirerInterval, lbService, metric))
                                 .ifPresent(maintainers::add);
         provisionServiceProvider.getHostProvisioner()
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/EmptyProvisionServiceProvider.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/EmptyProvisionServiceProvider.java
index 9a7fa672cfc..e7332f6474d 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/EmptyProvisionServiceProvider.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/EmptyProvisionServiceProvider.java
@@ -18,7 +18,7 @@ public class EmptyProvisionServiceProvider implements ProvisionServiceProvider {
     private final HostResourcesCalculator hostResourcesCalculator = new IdentityHostResourcesCalculator();
 
     @Override
-    public Optional<LoadBalancerService> getLoadBalancerService(NodeRepository nodeRepository) {
+    public Optional<LoadBalancerService> getLoadBalancerService() {
         return Optional.empty();
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java
index 9c4ebd73954..e24d71f22f2 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java
@@ -70,7 +70,7 @@ public class NodeRepositoryProvisioner implements Provisioner {
         this.allocationOptimizer = new AllocationOptimizer(nodeRepository);
         this.capacityPolicies = new CapacityPolicies(nodeRepository);
         this.zone = zone;
-        this.loadBalancerProvisioner = provisionServiceProvider.getLoadBalancerService(nodeRepository)
+        this.loadBalancerProvisioner = provisionServiceProvider.getLoadBalancerService()
                                                                .map(lbService -> new LoadBalancerProvisioner(nodeRepository, lbService));
         this.nodeResourceLimits = new NodeResourceLimits(nodeRepository);
         this.preparer = new Preparer(nodeRepository,
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisionServiceProvider.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisionServiceProvider.java
index c5835ec525a..6e301b7724c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisionServiceProvider.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisionServiceProvider.java
@@ -1,7 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.provision.provisioning;
 
-import com.yahoo.vespa.hosted.provision.NodeRepository;
 import com.yahoo.vespa.hosted.provision.lb.LoadBalancerService;
 
 import java.util.Optional;
@@ -13,7 +12,7 @@ import java.util.Optional;
  */
 public interface ProvisionServiceProvider {
 
-    Optional<LoadBalancerService> getLoadBalancerService(NodeRepository nodeRepository);
+    Optional<LoadBalancerService> getLoadBalancerService();
 
     Optional<HostProvisioner> getHostProvisioner();
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockProvisionServiceProvider.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockProvisionServiceProvider.java
index 9f6143e5daa..d72c5959082 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockProvisionServiceProvider.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockProvisionServiceProvider.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.hosted.provision.testutils;
 
 import com.google.inject.Inject;
-import com.yahoo.vespa.hosted.provision.NodeRepository;
 import com.yahoo.vespa.hosted.provision.lb.LoadBalancerService;
 import com.yahoo.vespa.hosted.provision.lb.LoadBalancerServiceMock;
 import com.yahoo.vespa.hosted.provision.provisioning.EmptyProvisionServiceProvider;
@@ -38,7 +37,7 @@ public class MockProvisionServiceProvider implements ProvisionServiceProvider {
     }
 
     @Override
-    public Optional<LoadBalancerService> getLoadBalancerService(NodeRepository nodeRepository) {
+    public Optional<LoadBalancerService> getLoadBalancerService() {
         return loadBalancerService;
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerServiceTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerServiceTest.java
index 28b40bb7642..4975e670e86 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerServiceTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/lb/SharedLoadBalancerServiceTest.java
@@ -4,8 +4,6 @@ package com.yahoo.vespa.hosted.provision.lb;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.HostName;
-import com.yahoo.config.provision.NodeType;
-import com.yahoo.vespa.hosted.provision.provisioning.ProvisioningTester;
 import org.junit.Test;
 
 import java.util.Optional;
@@ -18,8 +16,7 @@ import static org.junit.Assert.assertEquals;
  */
 public class SharedLoadBalancerServiceTest {
 
-    private final ProvisioningTester tester = new ProvisioningTester.Builder().build();
-    private final SharedLoadBalancerService loadBalancerService = new SharedLoadBalancerService(tester.nodeRepository(), "vip.example.com");
+    private final SharedLoadBalancerService loadBalancerService = new SharedLoadBalancerService("vip.example.com");
     private final ApplicationId applicationId = ApplicationId.from("tenant1", "application1", "default");
     private final ClusterSpec.Id clusterId = ClusterSpec.Id.from("qrs1");
     private final Set<Real> reals = Set.of(
@@ -29,18 +26,12 @@ public class SharedLoadBalancerServiceTest {
 
     @Test
     public void test_create_lb() {
-        tester.makeReadyNodes(2, "default", NodeType.proxy);
         var lb = loadBalancerService.create(new LoadBalancerSpec(applicationId, clusterId, reals), false);
 
         assertEquals(HostName.from("vip.example.com"), lb.hostname());
         assertEquals(Optional.empty(), lb.dnsZone());
-        assertEquals(Set.of("127.0.0.1/32", "127.0.0.2/32", "::1/128", "::2/128"), lb.networks());
-        assertEquals(Set.of(4080, 4443), lb.ports());
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void test_exception_on_missing_proxies() {
-        loadBalancerService.create(new LoadBalancerSpec(applicationId, clusterId, reals), false);
+        assertEquals(Set.of(), lb.networks());
+        assertEquals(Set.of(4443), lb.ports());
     }
 
     @Test