summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2019-01-03 14:24:00 +0100
committerMartin Polden <mpolden@mpolden.no>2019-01-03 14:24:25 +0100
commitc4ea4d8efa4fd574c76c1aea8286d966b194f85b (patch)
tree4468e1b5170a2aa9ce2abe14fe25662a739d78ad /node-repository
parent98548141e1a03c2972a47643e45ad57629e1b386 (diff)
Clarify physical nodes
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java2
-rw-r--r--node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java6
2 files changed, 4 insertions, 4 deletions
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 9b18f70eb64..0dabe252406 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
@@ -336,7 +336,7 @@ public class NodeFailer extends Maintainer {
// Allow failing nodes within policy
if (recentlyFailedNodes.size() < throttlePolicy.allowedToFailOf(nodes.size())) return false;
- // Always allow failing parents up to minimum limit
+ // Always allow failing physical nodes up to minimum limit
if (!node.parentHostname().isPresent() &&
recentlyFailedNodes.parents().size() < throttlePolicy.minimumAllowedToFail) return false;
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java
index 74c11e4fd27..b13e5c418f9 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java
@@ -477,7 +477,7 @@ public class NodeFailerTest {
List<Node> hosts = tester.nodeRepository.getNodes(NodeType.host);
List<Node> deadNodes = readyNodes.subList(0, 4);
- // 2 hours pass, 4 nodes die
+ // 2 hours pass, 4 physical nodes die
for (int minutes = 0, interval = 30; minutes < 2 * 60; minutes += interval) {
tester.clock.advance(Duration.ofMinutes(interval));
tester.allNodesMakeAConfigRequestExcept(deadNodes);
@@ -499,7 +499,7 @@ public class NodeFailerTest {
assertEquals("Throttling is indicated by the metric", 1, tester.metric.values.get(NodeFailer.throttlingActiveMetric));
assertEquals("Throttled node failures", 2, tester.metric.values.get(NodeFailer.throttledNodeFailuresMetric));
- // 18 more hours pass, the remaining 2 down nodes are allowed to fail
+ // 18 more hours pass, the remaining dead nodes are allowed to fail
for (int minutes = 0, interval = 30; minutes < 18 * 60; minutes += interval) {
tester.clock.advance(Duration.ofMinutes(interval));
tester.allNodesMakeAConfigRequestExcept(deadNodes);
@@ -541,7 +541,7 @@ public class NodeFailerTest {
assertEquals("Throttling is indicated by the metric", 1, tester.metric.values.get(NodeFailer.throttlingActiveMetric));
assertEquals("Throttled node failures", 1, tester.metric.values.get(NodeFailer.throttledNodeFailuresMetric));
- // The final Docker host and its containers are failed out
+ // The final host and its containers are failed out
tester.clock.advance(Duration.ofMinutes(30));
tester.failer.run();
assertEquals(16, tester.nodeRepository.getNodes(Node.State.failed).size());