diff options
Diffstat (limited to 'node-repository')
6 files changed, 4 insertions, 37 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancer.java index a6d311604fd..58c576d3f44 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancer.java @@ -1,12 +1,9 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.provision.lb; -import com.google.common.collect.ImmutableSortedSet; -import com.yahoo.config.provision.RotationName; import com.yahoo.vespa.hosted.provision.maintenance.LoadBalancerExpirer; import java.util.Objects; -import java.util.Set; /** * Represents a load balancer for an application's cluster. This is immutable. @@ -17,13 +14,11 @@ public class LoadBalancer { private final LoadBalancerId id; private final LoadBalancerInstance instance; - private final Set<RotationName> rotations; private final boolean inactive; - public LoadBalancer(LoadBalancerId id, LoadBalancerInstance instance, Set<RotationName> rotations, boolean inactive) { + public LoadBalancer(LoadBalancerId id, LoadBalancerInstance instance, boolean inactive) { this.id = Objects.requireNonNull(id, "id must be non-null"); this.instance = Objects.requireNonNull(instance, "instance must be non-null"); - this.rotations = ImmutableSortedSet.copyOf(Objects.requireNonNull(rotations, "rotations must be non-null")); this.inactive = inactive; } @@ -32,11 +27,6 @@ public class LoadBalancer { return id; } - /** The rotations of which this is a member */ - public Set<RotationName> rotations() { - return rotations; - } - /** The instance associated with this */ public LoadBalancerInstance instance() { return instance; @@ -52,7 +42,7 @@ public class LoadBalancer { /** Return a copy of this that is set inactive */ public LoadBalancer deactivate() { - return new LoadBalancer(id, instance, rotations, true); + return new LoadBalancer(id, instance, true); } } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializer.java index 17f2d7364a6..a4b915a6128 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializer.java @@ -2,7 +2,6 @@ package com.yahoo.vespa.hosted.provision.persistence; import com.yahoo.config.provision.HostName; -import com.yahoo.config.provision.RotationName; import com.yahoo.slime.ArrayTraverser; import com.yahoo.slime.Cursor; import com.yahoo.slime.Inspector; @@ -35,7 +34,6 @@ public class LoadBalancerSerializer { private static final String portsField = "ports"; private static final String networksField = "networks"; private static final String realsField = "reals"; - private static final String rotationsField = "rotations"; private static final String nameField = "name"; private static final String ipAddressField = "ipAddress"; private static final String portField = "port"; @@ -58,11 +56,6 @@ public class LoadBalancerSerializer { realObject.setString(ipAddressField, real.ipAddress()); realObject.setLong(portField, real.port()); }); - Cursor rotationArray = root.setArray(rotationsField); - loadBalancer.rotations().forEach(rotation -> { - Cursor rotationObject = rotationArray.addObject(); - rotationObject.setString(nameField, rotation.value()); - }); root.setBool(inactiveField, loadBalancer.inactive()); try { @@ -89,11 +82,6 @@ public class LoadBalancerSerializer { Set<String> networks = new LinkedHashSet<>(); object.field(networksField).traverse((ArrayTraverser) (i, network) -> networks.add(network.asString())); - Set<RotationName> rotations = new LinkedHashSet<>(); - object.field(rotationsField).traverse((ArrayTraverser) (i, rotation) -> { - rotations.add(RotationName.from(rotation.field(nameField).asString())); - }); - return new LoadBalancer(LoadBalancerId.fromSerializedForm(object.field(idField).asString()), new LoadBalancerInstance( HostName.from(object.field(hostnameField).asString()), @@ -102,7 +90,6 @@ public class LoadBalancerSerializer { networks, reals ), - rotations, object.field(inactiveField).asBool()); } 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 f5f8ed53d2a..372dca84a53 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 @@ -57,7 +57,7 @@ public class LoadBalancerProvisioner { LoadBalancerInstance instance = create(application, kv.getKey().id(), kv.getValue()); // Load balancer is always re-activated here to avoid reallocation if an application/cluster is // deleted and then redeployed. - LoadBalancer loadBalancer = new LoadBalancer(id, instance, kv.getKey().rotations(), false); + LoadBalancer loadBalancer = new LoadBalancer(id, instance, false); loadBalancers.put(loadBalancer.id(), loadBalancer); db.writeLoadBalancer(loadBalancer); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/LoadBalancersResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/LoadBalancersResponse.java index 69e13f77a09..d31834567ab 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/LoadBalancersResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/LoadBalancersResponse.java @@ -76,11 +76,7 @@ public class LoadBalancersResponse extends HttpResponse { realObject.setLong("port", real.port()); }); - Cursor rotationArray = lbObject.setArray("rotations"); - lb.rotations().forEach(rotation -> { - Cursor rotationObject = rotationArray.addObject(); - rotationObject.setString("name", rotation.value()); - }); + lbObject.setArray("rotations"); // To avoid changing the API. This can be removed when clients stop expecting this lbObject.setBool("inactive", lb.inactive()); }); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializerTest.java index 6de93c2ae65..460764b50db 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializerTest.java @@ -5,7 +5,6 @@ import com.google.common.collect.ImmutableSet; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.HostName; -import com.yahoo.config.provision.RotationName; import com.yahoo.vespa.hosted.provision.lb.DnsZone; import com.yahoo.vespa.hosted.provision.lb.LoadBalancer; import com.yahoo.vespa.hosted.provision.lb.LoadBalancerId; @@ -39,8 +38,6 @@ public class LoadBalancerSerializerTest { new Real(HostName.from("real-2"), "127.0.0.2", 4080))), - ImmutableSet.of(RotationName.from("eu-cluster"), - RotationName.from("us-cluster")), false); LoadBalancer serialized = LoadBalancerSerializer.fromJson(LoadBalancerSerializer.toJson(loadBalancer)); @@ -49,7 +46,6 @@ public class LoadBalancerSerializerTest { assertEquals(loadBalancer.instance().dnsZone(), serialized.instance().dnsZone()); assertEquals(loadBalancer.instance().ports(), serialized.instance().ports()); assertEquals(loadBalancer.instance().networks(), serialized.instance().networks()); - assertEquals(loadBalancer.rotations(), serialized.rotations()); assertEquals(loadBalancer.inactive(), serialized.inactive()); assertEquals(loadBalancer.instance().reals(), serialized.instance().reals()); } 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 58c0b3ed9cc..f97460713a5 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 @@ -61,7 +61,6 @@ public class LoadBalancerProvisionerTest { assertEquals(4080, get(loadBalancers.get().get(0).instance().reals(), 0).port()); assertEquals("127.0.0.2", get(loadBalancers.get().get(0).instance().reals(), 1).ipAddress()); assertEquals(4080, get(loadBalancers.get().get(0).instance().reals(), 1).port()); - assertEquals(rotationsCluster1, loadBalancers.get().get(0).rotations()); // A container is failed Supplier<List<Node>> containers = () -> tester.getNodes(app1).type(ClusterSpec.Type.container).asList(); @@ -105,7 +104,6 @@ public class LoadBalancerProvisionerTest { .map(Real::hostname) .sorted() .collect(Collectors.toList()); - assertEquals(rotationsCluster2, loadBalancers.get().get(1).rotations()); assertEquals(activeContainers, reals); // Application is removed and load balancer is deactivated |