diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2022-01-12 23:31:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-12 23:31:27 +0100 |
commit | 888868b993af28be2ccb4bee98dbf82f4b189cca (patch) | |
tree | 77b55e1c54a5ac1e51f5ebc1f19e1f9839e7bf49 | |
parent | 1fe403e17ab3af4ca02333661fbcaabfbe3d2d26 (diff) | |
parent | 349dca0425cda9e0eab7344f654b25459d58b099 (diff) |
Merge pull request #20785 from vespa-engine/bratseth/increase-warmupv7.527.20
Increase warmup duration
3 files changed, 3 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java index 3c26eef41d9..b7a5c1e7fe7 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java @@ -25,7 +25,7 @@ public class ClusterModel { private static final Logger log = Logger.getLogger(ClusterModel.class.getName()); /** Containers typically use more cpu right after generation change, so discard those metrics */ - public static final Duration warmupDuration = Duration.ofSeconds(90); + public static final Duration warmupDuration = Duration.ofMinutes(5); private static final Duration currentLoadDuration = Duration.ofMinutes(5); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterNodesTimeseries.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterNodesTimeseries.java index dd35eb7b54d..5ad4ef2e263 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterNodesTimeseries.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterNodesTimeseries.java @@ -31,7 +31,7 @@ public class ClusterNodesTimeseries { // If none can be detected we assume the node is new/was down. // If either this is the case, or there is a generation change, we ignore // the first warmupWindow metrics - var timeseries = db.getNodeTimeseries(period.plus(warmupDuration.multipliedBy(8)), clusterNodes); + var timeseries = db.getNodeTimeseries(period.plus(warmupDuration.multipliedBy(4)), clusterNodes); if (cluster.lastScalingEvent().isPresent()) { long currentGeneration = cluster.lastScalingEvent().get().generation(); timeseries = keepCurrentGenerationAfterWarmup(timeseries, currentGeneration); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeTimeseries.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeTimeseries.java index c58b08cb3b5..4a5f8972e11 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeTimeseries.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeTimeseries.java @@ -85,7 +85,7 @@ public class NodeTimeseries { if (snapshot.generation() < 0) return true; // Content nodes do not yet send generation if (snapshot.generation() < currentGeneration) return false; if (generationChange.isEmpty()) return true; - return ! snapshot.at().isBefore(generationChange.get().plus(warmupDuration.multipliedBy(2))); + return ! snapshot.at().isBefore(generationChange.get().plus(warmupDuration)); } } |