diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-03-19 13:03:38 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-03-19 13:03:38 +0100 |
commit | 904c61603407b1b522a86845376b458b5b33b2ce (patch) | |
tree | 5595894fca6c00b1a0f42c7d666d8809d858a0c4 /node-repository | |
parent | 7826d89cf412a8791e4ac35deb5f199e0e95526e (diff) |
Nonfunctional changes only
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java | 5 | ||||
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java index a24c282d48a..d957f4c0e25 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java @@ -390,7 +390,8 @@ public class NodeRepository extends AbstractComponent { public Node setDirty(String hostname, Agent agent, String reason) { Node node = getNode(hostname, Node.State.provisioned, Node.State.failed, Node.State.parked).orElseThrow(() -> - new IllegalArgumentException("Could not deallocate " + hostname + ": No such node in the provisioned, failed or parked state")); + new IllegalArgumentException("Could not deallocate " + hostname + + ": No such node in the provisioned, failed or parked state")); return setDirty(node, agent, reason); } @@ -482,7 +483,7 @@ public class NodeRepository extends AbstractComponent { * Should only be called by node-admin for docker containers */ public List<Node> markNodeAvailableForNewAllocation(String hostname) { - Node node = getNode(hostname).orElseThrow(() -> new NotFoundException("No node with hostname \"" + hostname + '"')); + Node node = getNode(hostname).orElseThrow(() -> new NotFoundException("No node with hostname '" + hostname + "'")); if (node.flavor().getType() != Flavor.Type.DOCKER_CONTAINER) { throw new IllegalArgumentException( "Cannot make " + hostname + " available for new allocation, must be a docker container node"); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java index d605958d6bc..e5d1bb98936 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java @@ -274,7 +274,8 @@ public class NodeFailer extends Maintainer { catch (RuntimeException e) { // The expected reason for deployment to fail here is that there is no capacity available to redeploy. // In that case we should leave the node in the active state to avoid failing additional nodes. - nodeRepository().reactivate(node.hostname(), Agent.system, "Failed to redeploy after being failed by NodeFailer"); + nodeRepository().reactivate(node.hostname(), Agent.system, + "Failed to redeploy after being failed by NodeFailer"); log.log(Level.WARNING, "Attempted to fail " + node + " for " + node.allocation().get().owner() + ", but redeploying without the node failed", e); return false; @@ -294,7 +295,7 @@ public class NodeFailer extends Maintainer { .filter(failedEvent -> failedEvent.at().isAfter(startOfThrottleWindow)) .count(); int allowedFailedNodes = (int) Math.max(nodes.size() * throttlePolicy.fractionAllowedToFail, - throttlePolicy.minimumAllowedToFail); + throttlePolicy.minimumAllowedToFail); boolean throttle = allowedFailedNodes < recentlyFailedNodes || (allowedFailedNodes == recentlyFailedNodes && !node.type().isDockerHost()); |