Merge pull request #14494 from vespa-engine/revert-14491-jonmv/allow-no-progress-for-4h

Revert "Allow no progress for 4h during upgrades"

7 files changed, 57 insertions, 57 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 af9acc7c3a8..3ebc8240889 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
@@ -987,7 +987,7 @@ public class InternalStepRunner implements StepRunner {
         Duration endpointCertificate() { return Duration.ofMinutes(20); }
         Duration tester() { return Duration.ofMinutes(30); }
         Duration nodesDown() { return Duration.ofMinutes(system.isCd() ? 30 : 60); }
-        Duration noNodesDown() { return Duration.ofMinutes(system.isCd() ? 30 : 240); }
+        Duration noNodesDown() { return Duration.ofMinutes(system.isCd() ? 30 : 120); }
         Duration testerCertificate() { return Duration.ofMinutes(300); }
 
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java
index 182af3e47ab..3d583f12a1c 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java
@@ -88,7 +88,7 @@ public class JobControllerApiHandlerHelperTest {
         assertEquals(deploymentFailed, tester.jobs().last(app.instanceId(), productionUsEast3).get().status());
 
         tester.runner().run();
-        tester.clock().advance(Duration.ofHours(4).plusSeconds(1));
+        tester.clock().advance(Duration.ofHours(2).plusSeconds(1));
         tester.runner().run();
         assertEquals(installationFailed, tester.jobs().last(app.instanceId(), productionUsWest1).get().status());
         assertEquals(revision2, app.deployment(productionUsCentral1.zone(tester.controller().system())).applicationVersion());
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json
index b8c48eb3d0c..e45bd190d5f 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json
@@ -128,8 +128,8 @@
         {
           "id": 3,
           "url": "https://some.url:43/instance/default/job/system-test/run/3",
-          "start": 14403000,
-          "end": 14403000,
+          "start": 7203000,
+          "end": 7203000,
           "status": "success",
           "versions": {
             "targetPlatform": "6.1.0",
@@ -320,9 +320,9 @@
       "dependencies": [],
       "declared": true,
       "instance": "default",
-      "readyAt": 15153000,
-      "delayedUntil": 15153000,
-      "coolingDownUntil": 15153000,
+      "readyAt": 7953000,
+      "delayedUntil": 7953000,
+      "coolingDownUntil": 7953000,
       "jobName": "staging-test",
       "url": "https://some.url:43/instance/default/job/staging-test",
       "environment": "staging",
@@ -351,8 +351,8 @@
         {
           "id": 5,
           "url": "https://some.url:43/instance/default/job/staging-test/run/5",
-          "start": 14503000,
-          "end": 14503000,
+          "start": 7303000,
+          "end": 7303000,
           "status": "installationFailed",
           "versions": {
             "targetPlatform": "6.1.0",
@@ -432,8 +432,8 @@
         {
           "id": 4,
           "url": "https://some.url:43/instance/default/job/staging-test/run/4",
-          "start": 14403000,
-          "end": 14403000,
+          "start": 7203000,
+          "end": 7203000,
           "status": "installationFailed",
           "versions": {
             "targetPlatform": "6.1.0",
@@ -513,8 +513,8 @@
         {
           "id": 3,
           "url": "https://some.url:43/instance/default/job/staging-test/run/3",
-          "start": 14403000,
-          "end": 14403000,
+          "start": 7203000,
+          "end": 7203000,
           "status": "success",
           "versions": {
             "targetPlatform": "6.1.0",
@@ -756,7 +756,7 @@
       ],
       "declared": true,
       "instance": "default",
-      "readyAt": 14403000,
+      "readyAt": 7203000,
       "jobName": "production-us-central-1",
       "url": "https://some.url:43/instance/default/job/production-us-central-1",
       "environment": "prod",
@@ -773,7 +773,7 @@
         {
           "id": 3,
           "url": "https://some.url:43/instance/default/job/production-us-central-1/run/3",
-          "start": 14403000,
+          "start": 7203000,
           "status": "running",
           "versions": {
             "targetPlatform": "6.1.0",
@@ -1050,7 +1050,7 @@
           "id": 2,
           "url": "https://some.url:43/instance/default/job/production-us-west-1/run/2",
           "start": 1000,
-          "end": 14402000,
+          "end": 7202000,
           "status": "installationFailed",
           "versions": {
             "targetPlatform": "6.1.0",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-aws-us-east-2a-runs.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-aws-us-east-2a-runs.json
index 3a78f8c44a0..2053b5a80b1 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-aws-us-east-2a-runs.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-aws-us-east-2a-runs.json
@@ -2,8 +2,8 @@
   "1": {
     "id": 1,
     "status": "success",
-    "start": 14503000,
-    "end": 14503000,
+    "start": 7303000,
+    "end": 7303000,
     "wantedPlatform": "7.1",
     "wantedApplication": {
       "hash": "unknown"
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/overview-user-instance.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/overview-user-instance.json
index 2601937faee..285e7f14e8f 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/overview-user-instance.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/overview-user-instance.json
@@ -8,8 +8,8 @@
             "targetApplication": {},
             "targetPlatform": "7.1.0"
           },
-          "start": 14503000,
-          "end": 14503000,
+          "start": 7303000,
+          "end": 7303000,
           "id": 1,
           "steps": [
             {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-runs.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-runs.json
index 37ae9e4b56b..2ad35968732 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-runs.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-runs.json
@@ -94,8 +94,8 @@
   "3": {
     "id": 3,
     "status": "success",
-    "start": 14403000,
-    "end": 14403000,
+    "start": 7203000,
+    "end": 7203000,
     "wantedPlatform": "6.1",
     "wantedApplication": {
       "hash": "1.0.3-commit1",
@@ -146,8 +146,8 @@
   "4": {
     "id": 4,
     "status": "installationFailed",
-    "start": 14403000,
-    "end": 14403000,
+    "start": 7203000,
+    "end": 7203000,
     "wantedPlatform": "6.1",
     "wantedApplication": {
       "hash": "1.0.3-commit1",
@@ -194,8 +194,8 @@
   "5": {
     "id": 5,
     "status": "installationFailed",
-    "start": 14503000,
-    "end": 14503000,
+    "start": 7303000,
+    "end": 7303000,
     "wantedPlatform": "6.1",
     "wantedApplication": {
       "hash": "1.0.3-commit1",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json
index e8c8e57aa9f..a941b824b53 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json
@@ -4,127 +4,127 @@
   "log": {
     "deployTester": [
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "No services requiring restart."
       },
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "Deployment successful."
       },
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "foo"
       }
     ],
     "installTester": [
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "host-tenant:application:default-t-staging.us-east-3: unorchestrated"
       },
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "--- platform dockerImage:6.1"
       },
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "--- container on port 43 has config generation 1, wanted is 2"
       },
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "host-tenant:application:default-t-staging.us-east-3: unorchestrated"
       },
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "--- platform dockerImage:6.1"
       },
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "--- container on port 43 has config generation 1, wanted is 2"
       },
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "host-tenant:application:default-t-staging.us-east-3: unorchestrated"
       },
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "--- platform dockerImage:6.1"
       },
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "--- container on port 43 has config generation 1, wanted is 2"
       }
     ],
     "deployInitialReal": [
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "Deploying platform version 6.1 and application version 1.0.1-commit1 ..."
       },
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "No services requiring restart."
       },
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "Deployment successful."
       },
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "foo"
       }
     ],
     "installInitialReal": [
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "######## Details for all nodes ########"
       },
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "host-tenant:application:default-staging.us-east-3: unorchestrated"
       },
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "--- platform dockerImage:6.1"
       },
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "--- container on port 43 has config generation 1, wanted is 2"
       },
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "Deployment expired before installation was successful."
       }
     ],
     "deactivateReal": [
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "Deactivating deployment of tenant.application in staging.us-east-3 ..."
       }
     ],
     "deactivateTester": [
       {
-        "at": 14503000,
+        "at": 7303000,
         "type": "info",
         "message": "Deactivating tester of tenant.application in staging.us-east-3 ..."
       }
@@ -134,19 +134,19 @@
   "steps": {
     "deployTester": {
       "status": "succeeded",
-      "startMillis": 14503000
+      "startMillis": 7303000
     },
     "installTester": {
       "status": "unfinished",
-      "startMillis": 14503000
+      "startMillis": 7303000
     },
     "deployInitialReal": {
       "status": "succeeded",
-      "startMillis": 14503000
+      "startMillis": 7303000
     },
     "installInitialReal": {
       "status": "failed",
-      "startMillis": 14503000,
+      "startMillis": 7303000,
       "convergence": {
         "nodes": 1,
         "down": 0,
@@ -182,19 +182,19 @@
     },
     "copyVespaLogs": {
       "status": "succeeded",
-      "startMillis": 14503000
+      "startMillis": 7303000
     },
     "deactivateReal": {
       "status": "succeeded",
-      "startMillis": 14503000
+      "startMillis": 7303000
     },
     "deactivateTester": {
       "status": "succeeded",
-      "startMillis": 14503000
+      "startMillis": 7303000
     },
     "report": {
       "status": "succeeded",
-      "startMillis": 14503000
+      "startMillis": 7303000
     }
   }
 }