Merge pull request #20699 from vespa-engine/mpolden/block-window-date-range

Support date range in block window

2 files changed, 4 insertions, 14 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
index 0d56bc286eb..684c497571d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
@@ -463,14 +463,13 @@ public class InternalStepRunner implements StepRunner {
         if ( ! endpoints.containsKey(zoneId))
             return false;
 
-        return endpoints.get(zoneId).parallelStream().map(endpoint -> {
+        return endpoints.get(zoneId).parallelStream().allMatch(endpoint -> {
             boolean ready = controller.jobController().cloud().ready(endpoint.url());
-            if ( ! ready) {
+            if (!ready) {
                 logger.log("Failed to get 100 consecutive OKs from " + endpoint);
-                return Boolean.FALSE;
             }
-            return Boolean.TRUE;
-        }).allMatch(Boolean.TRUE::equals);
+            return ready;
+        });
     }
 
     /** Returns true iff all containers in the tester deployment give 100 consecutive 200 OK responses on /status.html. */
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
index 604a42f3d19..d97f1d58043 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
@@ -554,15 +554,6 @@ public class MetricsReporterTest {
         assertEquals("Upgrade is overdue measure relative to window 3", Duration.ofHours(34).plusMinutes(30), metric.get());
     }
 
-    @Test
-    public void overdue_upgrade_completely_blocked() {
-        ApplicationPackage pkg = new ApplicationPackageBuilder().region("us-west-1")
-                                                                .blockChange(false, true, "mon-sun", "0-23", "CET")
-                                                                .build();
-        Instant mondayNight = Instant.parse("2021-12-13T23:00:00.00Z");
-        assertEquals(Duration.ZERO, MetricsReporter.overdueUpgradeDuration(mondayNight, pkg.deploymentSpec().requireInstance("default")));
-    }
-
     private void assertNodeCount(String metric, int n, Version version) {
         long nodeCount = metrics.getMetric((dimensions) -> version.toFullString().equals(dimensions.get("currentVersion")), metric)
                                 .stream()