aboutsummaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@verizonmedia.com>2019-02-18 22:38:52 +0100
committerHåkon Hallingstad <hakon@verizonmedia.com>2019-02-18 22:38:52 +0100
commit8e2f68ec807cc7443ba5db51796e9fd72ec2be9a (patch)
treee31ba3bd3fae2e26d2ab5ae7537030c262c32bc1 /node-repository
parentc3f34b6b1de9836d6d2175757a3081ffcc29a90c (diff)
Stop using Agent.NodeFailer until v6 is gone
vespa-maven-plugin fixed at v6 is in use by those apps.
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java10
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 c1c2d7b9cc5..d471dec36c8 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));
}
}
@@ -363,12 +363,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;
@@ -376,7 +376,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);