diff options
Diffstat (limited to 'node-repository/src')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java | 2 | ||||
-rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java index cf6473c6b1b..bb3d288e555 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java @@ -109,7 +109,7 @@ public class Nodes { */ public boolean isWorking() { NodeList activeNodes = list(Node.State.active); - if (activeNodes.size() <= 5) return true; // Not enough data to decide + if (activeNodes.size() < 20) return true; // Not enough data to decide NodeList downNodes = activeNodes.down(); return ! ( (double)downNodes.size() / (double)activeNodes.size() > 0.2 ); } 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 47803594148..54062e966f1 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 @@ -177,17 +177,17 @@ public class NodeFailerTest { @Test public void zone_is_not_working_if_too_many_nodes_down() { - NodeFailTester tester = NodeFailTester.withTwoApplications(); - - tester.serviceMonitor.setHostDown(tester.nodeRepository.nodes().list(Node.State.active).owner(NodeFailTester.app1).asList().get(0).hostname()); - tester.runMaintainers(); - assertTrue(tester.nodeRepository.nodes().isWorking()); + NodeFailTester tester = NodeFailTester.withTwoApplications(10, 5, 5); - tester.serviceMonitor.setHostDown(tester.nodeRepository.nodes().list(Node.State.active).owner(NodeFailTester.app1).asList().get(1).hostname()); - tester.runMaintainers(); - assertTrue(tester.nodeRepository.nodes().isWorking()); + int i = 0; + while (i < 4) { + tester.serviceMonitor.setHostDown(tester.nodeRepository.nodes().list(Node.State.active).owner(NodeFailTester.app1).asList().get(i).hostname()); + tester.runMaintainers(); + assertTrue(tester.nodeRepository.nodes().isWorking()); + i++; + } - tester.serviceMonitor.setHostDown(tester.nodeRepository.nodes().list(Node.State.active).owner(NodeFailTester.app1).asList().get(2).hostname()); + tester.serviceMonitor.setHostDown(tester.nodeRepository.nodes().list(Node.State.active).owner(NodeFailTester.app1).asList().get(i).hostname()); tester.runMaintainers(); assertFalse(tester.nodeRepository.nodes().isWorking()); |