diff options
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java | 6 | ||||
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java index 4aca1cbd056..7da10ce085a 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/History.java @@ -46,10 +46,8 @@ public class History { private static ImmutableMap<Event.Type, Event> toImmutableMap(Collection<Event> events) { ImmutableMap.Builder<Event.Type, Event> builder = new ImmutableMap.Builder<>(); - for (Event event : events) { - if (event.type() == Event.Type.requested) continue; // TODO (freva): Remove requested event after 8.70 + for (Event event : events) builder.put(event.type(), event); - } return builder.build(); } @@ -182,8 +180,6 @@ public class History { down, // The active node came up according to the service monitor up, - // The node made a config request, indicating it is live - requested, // The node resources/flavor were changed resized(false), // The node was rebooted 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 24c52f7b2e0..c0275de5798 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 @@ -423,7 +423,6 @@ public class NodeSerializer { case "deallocated" : return History.Event.Type.deallocated; case "down" : return History.Event.Type.down; case "up" : return History.Event.Type.up; - case "requested" : return History.Event.Type.requested; case "resized" : return History.Event.Type.resized; case "rebooted" : return History.Event.Type.rebooted; case "osUpgraded" : return History.Event.Type.osUpgraded; @@ -450,7 +449,6 @@ public class NodeSerializer { case deallocated : return "deallocated"; case down : return "down"; case up : return "up"; - case requested: return "requested"; case resized: return "resized"; case rebooted: return "rebooted"; case osUpgraded: return "osUpgraded"; |