diff options
| author | Harald Musum <musum@oath.com> | 2017-09-25 12:49:15 +0200 |
|---|---|---|
| committer | Harald Musum <musum@oath.com> | 2017-09-25 12:49:15 +0200 |
| commit | 2ea033a9af9bb9e4c1cdb873f153c3aedad7ee39 (patch) | |
| tree | 6f8cc61f85ef3e72ed597cd10c19887c2a595a14 /node-repository/src | |
| parent | a8d6f5c76bb7e9b18bcc16f6dd8f4e9b09d2ba4f (diff) | |
Let fail count indicate hw failure in cd too
Diffstat (limited to 'node-repository/src')
2 files changed, 1 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java index a86ba955a9a..b7971e61117 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java @@ -4,7 +4,6 @@ package com.yahoo.vespa.hosted.provision.maintenance; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.NodeType; -import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.Zone; import com.yahoo.vespa.hosted.provision.Node; import com.yahoo.vespa.hosted.provision.NodeRepository; @@ -80,7 +79,6 @@ public class FailedExpirer extends Expirer { private boolean failCountIndicatesHwFail(Zone zone, Node node) { if (node.flavor().getType() == Flavor.Type.DOCKER_CONTAINER) return false; - if (zone.system() == SystemName.cd) return false; return zone.environment() == Environment.prod || zone.environment() == Environment.staging; } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java index 3ccacb3ff02..51991a844d7 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirerTest.java @@ -75,8 +75,8 @@ public class FailedExpirerTest { clock.advance(Duration.ofDays(5)); failedExpirer.run(); + assertNodeHostnames(Node.State.failed, "node1"); assertNodeHostnames(Node.State.parked, "node2", "node3"); - assertNodeHostnames(Node.State.dirty, "node1"); } @Test |