Merge pull request #11698 from vespa-engine/hmusum/use-Agent.NodeFailer-again

Remove mitigation for "NodeFailer" agent

2 files changed, 6 insertions, 12 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 db79e3164fc..dca5c092ad2 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.system, reason);
+                nodeRepository().fail(node.hostname(), Agent.NodeFailer, 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.system, lastLocalRequest.get()));
+                        .with(new History.Event(History.Event.Type.requested, Agent.NodeFailer, lastLocalRequest.get()));
                 nodeRepository().write(node.with(updatedHistory), lock);
             }
         }
@@ -357,12 +357,12 @@ public class NodeFailer extends Maintainer {
                 if (failingTenantNode.state() == Node.State.active) {
                     allTenantNodesFailedOutSuccessfully &= failActive(failingTenantNode, reasonForChildFailure);
                 } else {
-                    nodeRepository().fail(failingTenantNode.hostname(), Agent.system, reasonForChildFailure);
+                    nodeRepository().fail(failingTenantNode.hostname(), Agent.NodeFailer, reasonForChildFailure);
                 }
             }
 
             if (! allTenantNodesFailedOutSuccessfully) return false;
-            node = nodeRepository().fail(node.hostname(), Agent.system, reason);
+            node = nodeRepository().fail(node.hostname(), Agent.NodeFailer, reason);
             try {
                 deployment.get().activate();
                 return true;
@@ -373,7 +373,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.system,
+                nodeRepository().reactivate(node.hostname(), Agent.NodeFailer,
                                             "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);
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java
index feab5ed1ed8..7ed05432e01 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java
@@ -203,7 +203,7 @@ class NodesResponse extends HttpResponse {
             Cursor object = array.addObject();
             object.setString("event", event.type().name());
             object.setLong("at", event.at().toEpochMilli());
-            object.setString("agent", normalizedAgentUntilV6IsGone(event.agent()).name());
+            object.setString("agent", event.agent().name());
         }
     }
 
@@ -232,12 +232,6 @@ class NodesResponse extends HttpResponse {
         return nodeRepository.dockerImage(nodeType.isDockerHost() ? nodeType.childNodeType() : nodeType);
     }
 
-
-    /** maven-vespa-plugin @ v6 needs to deserialize nodes w/history. */
-    private Agent normalizedAgentUntilV6IsGone(Agent agent) {
-        return agent == Agent.NodeFailer ? Agent.system : agent;
-    }
-
     private void ipAddressesToSlime(Set<String> ipAddresses, Cursor array) {
         ipAddresses.forEach(array::addString);
     }