diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2023-04-14 09:46:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-14 09:46:41 +0200 |
| commit | b66f35888ad413800ac16f841582da5bf067cb7f (patch) | |
| tree | 433b7a9444f30548b46f6b97901a70fcfe77c416 /node-repository | |
| parent | a2d73b3942d48015a0e52fe1163e5e0c27aa2316 (diff) | |
| parent | 3d53631b5c0ae73b4a302c5d1604d731d27044f4 (diff) | |
Merge pull request #26736 from vespa-engine/bratseth/cleanup-065
No functional changes
Diffstat (limited to 'node-repository')
3 files changed, 5 insertions, 5 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 691f88a9be3..eff39dddf42 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 @@ -107,7 +107,7 @@ public class GroupPreparer { // Offer the nodes on the newly provisioned hosts, this should be enough to cover the deficit List<NodeCandidate> candidates = provisionedHosts.stream() .map(host -> NodeCandidate.createNewExclusiveChild(host.generateNode(), - host.generateHost())) + host.generateHost())) .toList(); allocation.offer(candidates); }; diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeSpec.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeSpec.java index 59c089943ab..9edfa221abf 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeSpec.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeSpec.java @@ -185,7 +185,7 @@ public interface NodeSpec { } - /** A node spec specifying a node type. This will accept all nodes of this type. */ + /** A node spec specifying a node type. */ class TypeNodeSpec implements NodeSpec { private static final Map<NodeType, Integer> WANTED_NODE_COUNT = Map.of(NodeType.config, 3, @@ -256,7 +256,7 @@ public interface NodeSpec { } @Override - public String toString() { return "request for all nodes of type '" + type + "'"; } + public String toString() { return "request for nodes of type '" + type + "'"; } } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisionedHost.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisionedHost.java index d083d81c196..98afc6e7482 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisionedHost.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisionedHost.java @@ -75,8 +75,8 @@ public class ProvisionedHost { /** Generate {@link Node} instance representing the node running on this physical host */ public Node generateNode() { return Node.reserve(Set.of(), nodeHostname(), hostHostname, nodeResources, hostType.childNodeType()) - .cloudAccount(cloudAccount) - .build(); + .cloudAccount(cloudAccount) + .build(); } public String getId() { return id; } |