diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2020-12-03 11:26:53 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2020-12-03 11:26:53 +0100 |
| commit | 70c1ff0d0caba8d202cae0197aca4a71fe6dd14a (patch) | |
| tree | ffa8c74406fdd4029638235df0afcc329dafbff2 /node-repository | |
| parent | f4b5f2c178730aa26295a2ef61ca81a0b992eb77 (diff) | |
Explicitly allow unknown generations
Diffstat (limited to 'node-repository')
2 files changed, 3 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterTimeseries.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterTimeseries.java index 43ce5b0ff5a..2e02fccdab5 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterTimeseries.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterTimeseries.java @@ -39,7 +39,8 @@ public class ClusterTimeseries { measurementCount = timeseries.stream().mapToInt(m -> m.size()).sum(); if (cluster.lastScalingEvent().isPresent()) - timeseries = filter(timeseries, snapshot -> snapshot.generation() >= cluster.lastScalingEvent().get().generation()); + timeseries = filter(timeseries, snapshot -> snapshot.generation() < 0 || // Content nodes do not yet send generation + snapshot.generation() >= cluster.lastScalingEvent().get().generation()); measurementCountWithoutStale = timeseries.stream().mapToInt(m -> m.size()).sum(); timeseries = filter(timeseries, snapshot -> snapshot.inService()); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java index 59e8b3e10ed..5183eb1d628 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java @@ -101,6 +101,7 @@ public class MetricsResponse { generation { // application config generation active on the node public String metricResponseName() { return "application_generation"; } double convertValue(double metricValue) { return (float)metricValue; } // Really a long + double defaultValue() { return -1.0; } }, inService { public String metricResponseName() { return "in_service"; } |