Keep metrics for longer

4 files changed, 6 insertions, 5 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validator.java
index c926c1f13a0..f3bebbe7fb9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/Validator.java
@@ -8,7 +8,6 @@ import com.yahoo.vespa.model.VespaModel;
  * Abstract superclass of all application package validators.
  *
  * @author hmusum
- * @since 2010-01-29
  */
 public abstract class Validator {
 
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 084f2deb030..a16277585a2 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
@@ -67,6 +67,7 @@ public class ClusterTimeseries {
 
     /** The current query rate as a fraction of the peak rate in this timeseries */
     public double currentQueryFractionOfMax() {
+
         return 0.5; // default
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java
index 37e70e3539a..f6a096c199a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java
@@ -132,8 +132,9 @@ public class QuestMetricsDb extends AbstractComponent implements MetricsDb {
 
     @Override
     public void gc() {
-        // Since we remove full days at once we need to keep at least the scaling window + 1 day
-        Instant oldestToKeep = clock.instant().minus(Autoscaler.maxScalingWindow().plus(Duration.ofDays(1)));
+        // We remove full days at once and we want to see at least three days to not every only see
+        // query rates from weekends
+        Instant oldestToKeep = clock.instant().minus(Duration.ofDays(4));
         SqlExecutionContext context = newContext();
         int partitions = 0;
         try (SqlCompiler compiler = new SqlCompiler(engine)) {
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDbTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDbTest.java
index 70f9d581816..8c110559112 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDbTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDbTest.java
@@ -116,10 +116,10 @@ public class QuestMetricsDbTest {
         assertEquals(24 * 10, db.getNodeTimeseries(Duration.between(startTime, clock.instant()),
                                                    Set.of("host1")).get(0).size());
         db.gc();
-        assertEquals(48 * 1 + dayOffset, db.getNodeTimeseries(Duration.between(startTime, clock.instant()),
+        assertEquals(75, db.getNodeTimeseries(Duration.between(startTime, clock.instant()),
                                                               Set.of("host1")).get(0).size());
         db.gc(); // no-op
-        assertEquals(48 * 1 + dayOffset, db.getNodeTimeseries(Duration.between(startTime, clock.instant()),
+        assertEquals(75, db.getNodeTimeseries(Duration.between(startTime, clock.instant()),
                                                               Set.of("host1")).get(0).size());
     }