Filter unstable at db insert

6 files changed, 21 insertions, 10 deletions

diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java
index 3faa4c244ee..eb3be65d364 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java
@@ -138,7 +138,8 @@ class AutoscalingTester {
                                                                               memory,
                                                                               disk,
                                                                               0,
-                                                                              true))));
+                                                                              true,
+                                                                              false))));
             }
         }
     }
@@ -168,7 +169,8 @@ class AutoscalingTester {
                                                                               memory,
                                                                               disk,
                                                                               0,
-                                                                              true))));
+                                                                              true,
+                                                                              false))));
             }
         }
     }
@@ -183,7 +185,8 @@ class AutoscalingTester {
                                                                               memory,
                                                                               disk,
                                                                               generation,
-                                                                              true))));
+                                                                              true,
+                                                                              false))));
             }
         }
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java
index dd991f15087..094b46a881a 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java
@@ -17,6 +17,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 public class MetricsV2MetricsFetcherTest {
@@ -70,14 +71,17 @@ public class MetricsV2MetricsFetcherTest {
             assertEquals(0.15, values.get(0).getSecond().memory(), delta);
             assertEquals(0.20, values.get(0).getSecond().disk(), delta);
             assertEquals(3, values.get(0).getSecond().generation(), delta);
+            assertFalse(values.get(0).getSecond().unstable());
         }
 
         {
+            httpClient.cannedResponse = cannedResponseForApplication2;
             try (Mutex lock = tester.nodeRepository().lock(application1)) {
-                tester.nodeRepository().write(tester.nodeRepository().getNodes(application1, Node.State.active)
+                tester.nodeRepository().write(tester.nodeRepository().getNodes(application2, Node.State.active)
                         .get(0).retire(tester.clock().instant()), lock);
             }
-            assertTrue("No metrics fetching while unstable", fetcher.fetchMetrics(application1).isEmpty());
+            List<Pair<String, MetricSnapshot>> values = new ArrayList<>(fetcher.fetchMetrics(application2));
+            assertTrue(values.get(0).getSecond().unstable());
         }
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsDbTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsDbTest.java
index dba19d675dd..681fc082019 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsDbTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsDbTest.java
@@ -40,7 +40,7 @@ public class NodeMetricsDbTest {
         MetricsDb db = MetricsDb.createTestInstance(tester.nodeRepository());
         Collection<Pair<String, MetricSnapshot>> values = new ArrayList<>();
         for (int i = 0; i < 40; i++) {
-            values.add(new Pair<>(node0, new MetricSnapshot(clock.instant(), 0.9f, 0.6f, 0.6f, 0, true)));
+            values.add(new Pair<>(node0, new MetricSnapshot(clock.instant(), 0.9f, 0.6f, 0.6f, 0, true, false)));
             clock.advance(Duration.ofMinutes(120));
         }
         db.add(values);
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 b97d5136485..24cb6281a3c 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
@@ -121,7 +121,8 @@ public class QuestMetricsDbTest {
                                                                    i * 0.2,
                                                                    i * 0.4,
                                                                    i % 100,
-                                                                   true)));
+                                                                   true,
+                                                                   false)));
             clock.advance(sampleRate);
         }
         return timeseries;
@@ -136,7 +137,8 @@ public class QuestMetricsDbTest {
                                                                    i * 0.2,
                                                                    i * 0.4,
                                                                    i % 100,
-                                                                   true)));
+                                                                   true,
+                                                                   false)));
         }
         return timeseries;
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTester.java
index fadcd40ad0a..7c9156ca984 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTester.java
@@ -77,7 +77,8 @@ public class AutoscalingMaintainerTester {
                                                                                      mem,
                                                                                      disk,
                                                                                      generation,
-                                                                                     true))));
+                                                                                     true,
+                                                                                     false))));
         }
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainerTest.java
index 15966a4c44b..062f17e6e1e 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainerTest.java
@@ -81,7 +81,8 @@ public class ScalingSuggestionsMaintainerTest {
                                                                               memory,
                                                                               disk,
                                                                               generation,
-                                                                              true))));
+                                                                              true,
+                                                                              false))));
         }
     }