diff options
author | Jon Bratseth <bratseth@oath.com> | 2019-02-18 22:48:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-18 22:48:06 +0100 |
commit | 4857bb6f11340e3d2cd0b15ebcdaa9ecb5a6be33 (patch) | |
tree | a60f586bd4640ba7fc809da7a0c12c529c8b6f51 /node-repository | |
parent | 9ac30d19ff990a05d4427ff9e8d8bf46c9892dbf (diff) | |
parent | 8e2f68ec807cc7443ba5db51796e9fd72ec2be9a (diff) |
Merge pull request #8545 from vespa-engine/hakonhall/stop-using-agentnodefailer-until-v6-is-gone
Stop using Agent.NodeFailer until v6 is gone
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java | 10 |
1 files changed, 5 insertions, 5 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 d7a71580a46..8db1e854bbb 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 @@ -108,7 +108,7 @@ public class NodeFailer extends Maintainer { continue; } String reason = entry.getValue(); - nodeRepository().fail(node.hostname(), Agent.NodeFailer, reason); + nodeRepository().fail(node.hostname(), Agent.system, reason); } } @@ -144,7 +144,7 @@ public class NodeFailer extends Maintainer { if (! node.history().hasEventAfter(History.Event.Type.requested, lastLocalRequest.get())) { History updatedHistory = node.history() - .with(new History.Event(History.Event.Type.requested, Agent.NodeFailer, lastLocalRequest.get())); + .with(new History.Event(History.Event.Type.requested, Agent.system, lastLocalRequest.get())); nodeRepository().write(node.with(updatedHistory)); } } @@ -373,12 +373,12 @@ public class NodeFailer extends Maintainer { if (failingTenantNode.state() == Node.State.active) { allTenantNodesFailedOutSuccessfully &= failActive(failingTenantNode, reasonForChildFailure); } else { - nodeRepository().fail(failingTenantNode.hostname(), Agent.NodeFailer, reasonForChildFailure); + nodeRepository().fail(failingTenantNode.hostname(), Agent.system, reasonForChildFailure); } } if (! allTenantNodesFailedOutSuccessfully) return false; - node = nodeRepository().fail(node.hostname(), Agent.NodeFailer, reason); + node = nodeRepository().fail(node.hostname(), Agent.system, reason); try { deployment.get().activate(); return true; @@ -386,7 +386,7 @@ 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.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); |