diff options
author | Arnstein Ressem <aressem@gmail.com> | 2021-06-04 21:57:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-04 21:57:32 +0200 |
commit | cd1b747b4f65fa3a6ed6aace23235db7591638c5 (patch) | |
tree | 810ae8989030055b3cea65c684f69c0cfbd404b5 /node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java | |
parent | b14315a6f51bc8e5bce22e0d9d11d0e730aaf96d (diff) |
Revert "Emit a success factor from maintainers"
Diffstat (limited to 'node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java | 16 |
1 files changed, 3 insertions, 13 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 f16459ee8b9..effa41dc69f 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 @@ -72,21 +72,17 @@ public class NodeFailer extends NodeRepositoryMaintainer { } @Override - protected double maintain() { - if ( ! nodeRepository().nodes().isWorking()) return 0.0; + protected boolean maintain() { + if ( ! nodeRepository().nodes().isWorking()) return false; - int attempts = 0; - int failures = 0; int throttledHostFailures = 0; int throttledNodeFailures = 0; // Ready nodes try (Mutex lock = nodeRepository().nodes().lockUnallocated()) { for (Map.Entry<Node, String> entry : getReadyNodesByFailureReason().entrySet()) { - attempts++; Node node = entry.getKey(); if (throttle(node)) { - failures++; if (node.type().isHost()) throttledHostFailures++; else @@ -100,12 +96,10 @@ public class NodeFailer extends NodeRepositoryMaintainer { // Active nodes for (Map.Entry<Node, String> entry : getActiveNodesByFailureReason().entrySet()) { - attempts++; Node node = entry.getKey(); if (!failAllowedFor(node.type())) continue; if (throttle(node)) { - failures++; if (node.type().isHost()) throttledHostFailures++; else @@ -122,15 +116,11 @@ public class NodeFailer extends NodeRepositoryMaintainer { if ( ! activeNodes.childrenOf(host).isEmpty()) continue; Optional<NodeMutex> locked = Optional.empty(); try { - attempts++; locked = nodeRepository().nodes().lockAndGet(host); if (locked.isEmpty()) continue; nodeRepository().nodes().fail(List.of(locked.get().node()), Agent.NodeFailer, "Host should be failed and have no tenant nodes"); } - catch (Exception e) { - failures++; - } finally { locked.ifPresent(NodeMutex::close); } @@ -140,7 +130,7 @@ public class NodeFailer extends NodeRepositoryMaintainer { metric.set(throttlingActiveMetric, throttlingActive, null); metric.set(throttledHostFailuresMetric, throttledHostFailures, null); metric.set(throttledNodeFailuresMetric, throttledNodeFailures, null); - return asSuccessFactor(attempts, failures); + return throttlingActive == 0; } private Map<Node, String> getReadyNodesByFailureReason() { |