diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2019-07-12 12:38:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-12 12:38:14 +0200 |
| commit | a9d382927b90ff9550558aef2ac9ff34696b88c2 (patch) | |
| tree | d39a4a6b6070e68073f9a573542c681f22e00000 | |
| parent | 21bcc11e62f4bceb2e0b2e8810494c0dc7528ac0 (diff) | |
| parent | 21044442f1de999f1b90803c6d29f0e23656e0e3 (diff) | |
Merge pull request #10030 from vespa-engine/mgimle/remove-noderetirer-enums
Removed Agent enums pertaining to the now-removed NodeRetirer
3 files changed, 2 insertions, 4 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeHistory.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeHistory.java index 42e2c97e515..a4691001adc 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeHistory.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeHistory.java @@ -32,6 +32,6 @@ public class NodeHistory { return event; } - public enum Agent { system, application, operator, NodeRetirer, NodeFailer } + public enum Agent { system, application, operator, NodeFailer } } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Agent.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Agent.java index 812c370df5f..f46e2f501bc 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Agent.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Agent.java @@ -7,5 +7,5 @@ package com.yahoo.vespa.hosted.provision.node; * @author bratseth */ public enum Agent { - system, application, operator, NodeRetirer, NodeFailer + system, application, operator, NodeFailer } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java index cf6531c0748..6198183be89 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java @@ -385,7 +385,6 @@ public class NodeSerializer { case "application" : return Agent.application; case "system" : return Agent.system; case "operator" : return Agent.operator; - case "NodeRetirer" : return Agent.system; // TODO: Remove after 7.67 case "NodeFailer" : return Agent.NodeFailer; } throw new IllegalArgumentException("Unknown node event agent '" + eventAgentField.asString() + "'"); @@ -395,7 +394,6 @@ public class NodeSerializer { case application : return "application"; case system : return "system"; case operator : return "operator"; - case NodeRetirer : return "system"; // TODO: Remove after 7.67 case NodeFailer : return "NodeFailer"; } throw new IllegalArgumentException("Serialized form of '" + agent + "' not defined"); |