diff options
author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-06-12 16:56:08 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-06-14 09:18:46 +0200 |
commit | 7a2e96f8a0cb326a02a41cc54ceabfb5e9345aa3 (patch) | |
tree | b91ca60c3008b763f05b62acf20d1eac2de7e54b /node-repository | |
parent | 4c8a558a62bd12678fe070109a49542ee5dc43ae (diff) |
Compare enums directly
Diffstat (limited to 'node-repository')
2 files changed, 7 insertions, 8 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacity.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacity.java index bc16eb5fb1a..97db37a23c0 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacity.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacity.java @@ -25,7 +25,7 @@ public class DockerHostCapacity { } int compareWithoutInactive(Node hostA, Node hostB) { - int result = compare(freeCapacityOf(hostB, true), freeCapacityOf(hostA, true)); + int result = compare(freeCapacityOf(hostB, true), freeCapacityOf(hostA, true)); if (result != 0) return result; // If resources are equal we want to assign to the one with the most IPaddresses free @@ -59,7 +59,7 @@ public class DockerHostCapacity { */ public NodeResources freeCapacityOf(Node dockerHost, boolean includeInactive) { // Only hosts have free capacity - if ( ! dockerHost.type().equals(NodeType.host)) return new NodeResources(0, 0, 0); + if (dockerHost.type() != NodeType.host) return new NodeResources(0, 0, 0); // Subtract used resources without taking disk speed into account since existing allocations grandfathered in // may not use reflect the actual disk speed (as of May 2019). This (the 3 diskSpeed assignments below) @@ -71,8 +71,8 @@ public class DockerHostCapacity { .withDiskSpeed(dockerHost.flavor().resources().diskSpeed()); } - private boolean isInactiveOrRetired(Node node) { - if (node.state().equals(Node.State.inactive)) return true; + private static boolean isInactiveOrRetired(Node node) { + if (node.state() == Node.State.inactive) return true; if (node.allocation().isPresent() && node.allocation().get().membership().retired()) return true; return false; } 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 c3281253b6b..643243d5c3a 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 @@ -6,10 +6,10 @@ import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.Capacity; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.Environment; -import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.HostFilter; import com.yahoo.config.provision.HostSpec; import com.yahoo.config.provision.NodeFlavors; +import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.NodeType; import com.yahoo.config.provision.ProvisionLogger; import com.yahoo.config.provision.Provisioner; @@ -27,7 +27,6 @@ import com.yahoo.vespa.hosted.provision.node.filter.NodeHostFilter; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Optional; @@ -64,7 +63,7 @@ public class NodeRepositoryProvisioner implements Provisioner { this.capacityPolicies = new CapacityPolicies(zone, flavors); this.zone = zone; this.preparer = new Preparer(nodeRepository, - zone.environment().equals(Environment.prod) ? SPARE_CAPACITY_PROD : SPARE_CAPACITY_NONPROD, + zone.environment() == Environment.prod ? SPARE_CAPACITY_PROD : SPARE_CAPACITY_NONPROD, provisionServiceProvider.getHostProvisioner(), Flags.ENABLE_DYNAMIC_PROVISIONING.bindTo(flagSource)); this.activator = new Activator(nodeRepository); @@ -140,7 +139,7 @@ public class NodeRepositoryProvisioner implements Provisioner { log.log(LogLevel.DEBUG, () -> "Prepared node " + node.hostname() + " - " + node.flavor()); Allocation nodeAllocation = node.allocation().orElseThrow(IllegalStateException::new); hosts.add(new HostSpec(node.hostname(), - Collections.emptyList(), + List.of(), Optional.of(node.flavor()), Optional.of(nodeAllocation.membership()), node.status().vespaVersion(), |