diff options
author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-02-04 14:48:58 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-02-06 16:26:43 +0100 |
commit | c00e92c628045b7089482004672d0cc4b175c1a2 (patch) | |
tree | 1d6bd2061dc5a9571a46c9b6542a6ad7a02f6de3 /node-repository | |
parent | 250a99d3eb25be066e3c2de1699a589714b1ca68 (diff) |
Fix method name typo
Diffstat (limited to 'node-repository')
4 files changed, 11 insertions, 11 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java index 8d6edbd7b9b..03d2557d8b6 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java @@ -63,7 +63,7 @@ public class GroupPreparer { // Allocate from the prioritized list NodeAllocation allocation = new NodeAllocation(application, cluster, requestedNodes, highestIndex, nodeRepository); allocation.offer(prioritizer.prioritize()); - if (! allocation.fullfilled() && requestedNodes.canFail()) + if (! allocation.fulfilled() && requestedNodes.canFail()) throw new OutOfCapacityException("Could not satisfy " + requestedNodes + " for " + cluster + " in " + application.toShortString() + outOfCapacityDetails(allocation)); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java index e2293578f4a..39ce9377969 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java @@ -246,7 +246,7 @@ class NodeAllocation { } /** Returns true if the content of this list is sufficient to meet the request */ - boolean fullfilled() { + boolean fulfilled() { return requestedNodes.fulfilledBy(acceptedOfRequestedFlavor); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java index 0646e23b141..55f220f53b0 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java @@ -209,7 +209,7 @@ public class NodePrioritizer { return pri; } - static boolean isPreferredNodeToBeReloacted(List<Node> nodes, Node node, Node parent) { + static boolean isPreferredNodeToBeRelocated(List<Node> nodes, Node node, Node parent) { NodeList list = new NodeList(nodes); return list.childrenOf(parent).asList().stream() .sorted(NodePrioritizer::compareForRelocation) diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizerTest.java index 3ab83f20173..85dc97e5aba 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizerTest.java @@ -35,18 +35,18 @@ public class NodePrioritizerTest { nodes.add(b); // Only one node - should be obvious what to prefer - Assert.assertTrue(NodePrioritizer.isPreferredNodeToBeReloacted(nodes, b, parent)); + Assert.assertTrue(NodePrioritizer.isPreferredNodeToBeRelocated(nodes, b, parent)); // Two equal nodes - choose lexically Node a = createNode(parent, "a", "d2"); nodes.add(a); - Assert.assertTrue(NodePrioritizer.isPreferredNodeToBeReloacted(nodes, a, parent)); - Assert.assertFalse(NodePrioritizer.isPreferredNodeToBeReloacted(nodes, b, parent)); + Assert.assertTrue(NodePrioritizer.isPreferredNodeToBeRelocated(nodes, a, parent)); + Assert.assertFalse(NodePrioritizer.isPreferredNodeToBeRelocated(nodes, b, parent)); // Smallest node should be preferred Node c = createNode(parent, "c", "d1"); nodes.add(c); - Assert.assertTrue(NodePrioritizer.isPreferredNodeToBeReloacted(nodes, c, parent)); + Assert.assertTrue(NodePrioritizer.isPreferredNodeToBeRelocated(nodes, c, parent)); // Unallocated over allocated ClusterSpec spec = ClusterSpec.from(ClusterSpec.Type.content, ClusterSpec.Id.from("mycluster"), ClusterSpec.Group.from(0), Version.fromString("6.142.22"), false, Collections.emptySet()); @@ -55,16 +55,16 @@ public class NodePrioritizerTest { nodes.add(c); Node d = createNode(parent, "d", "d1"); nodes.add(d); - Assert.assertTrue(NodePrioritizer.isPreferredNodeToBeReloacted(nodes, d, parent)); - Assert.assertFalse(NodePrioritizer.isPreferredNodeToBeReloacted(nodes, c, parent)); + Assert.assertTrue(NodePrioritizer.isPreferredNodeToBeRelocated(nodes, d, parent)); + Assert.assertFalse(NodePrioritizer.isPreferredNodeToBeRelocated(nodes, c, parent)); // Container over content ClusterSpec spec2 = ClusterSpec.from(ClusterSpec.Type.container, ClusterSpec.Id.from("mycluster"), ClusterSpec.Group.from(0), Version.fromString("6.142.22"), false, Collections.emptySet()); d = d.allocate(ApplicationId.defaultId(), ClusterMembership.from(spec2, 0), Instant.now()); nodes.remove(d); nodes.add(d); - Assert.assertFalse(NodePrioritizer.isPreferredNodeToBeReloacted(nodes, c, parent)); - Assert.assertTrue(NodePrioritizer.isPreferredNodeToBeReloacted(nodes, d, parent)); + Assert.assertFalse(NodePrioritizer.isPreferredNodeToBeRelocated(nodes, c, parent)); + Assert.assertTrue(NodePrioritizer.isPreferredNodeToBeRelocated(nodes, d, parent)); } private static Node createNode(Node parent, String hostname, String flavor) { |