diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2020-09-23 09:01:51 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2020-09-23 09:01:51 +0200 |
commit | 32ae03339b525a01fb2cdb82f542f6b4071770ed (patch) | |
tree | a6802f7ee68f44333372e50c383a962587421081 /controller-server/src | |
parent | 542e019e9321065099246a30c3397e72d8c6f16e (diff) |
Allow 4h without progress, with fixes to clock sensitive test
Diffstat (limited to 'controller-server/src')
8 files changed, 60 insertions, 60 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 3ebc8240889..af9acc7c3a8 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 : 120); } + Duration noNodesDown() { return Duration.ofMinutes(system.isCd() ? 30 : 240); } Duration testerCertificate() { return Duration.ofMinutes(300); } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java index cc92c6cd271..522d44ed667 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java @@ -116,7 +116,7 @@ public class UpgraderTest { assertEquals("New system version: Should upgrade Canaries", 4, tester.jobs().active().size()); canary0.runJob(systemTest); - canary0.timeOutUpgrade(stagingTest); + canary0.failDeployment(stagingTest); tester.controllerTester().computeVersionStatus(); assertEquals(VespaVersion.Confidence.broken, tester.controller().versionStatus().systemVersion().get().confidence()); @@ -153,7 +153,7 @@ public class UpgraderTest { assertEquals("Canaries done: Should upgrade defaults", 6, tester.jobs().active().size()); default0.runJob(systemTest); - default0.timeOutConvergence(stagingTest); + default0.failDeployment(stagingTest); default1.deployPlatform(version3); default2.deployPlatform(version3); @@ -1035,7 +1035,7 @@ public class UpgraderTest { assertEquals(v3, application.instanceJobs().get(stagingTest).lastSuccess().get().versions().targetPlatform()); // First deployment fails and then successfully upgrades to v3 - application.timeOutUpgrade(productionUsCentral1); + application.failDeployment(productionUsCentral1); application.runJob(productionUsCentral1); // Deployments are now on 3 versions 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 3d583f12a1c..182af3e47ab 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(2).plusSeconds(1)); + tester.clock().advance(Duration.ofHours(4).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 e45bd190d5f..b8c48eb3d0c 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": 7203000, - "end": 7203000, + "start": 14403000, + "end": 14403000, "status": "success", "versions": { "targetPlatform": "6.1.0", @@ -320,9 +320,9 @@ "dependencies": [], "declared": true, "instance": "default", - "readyAt": 7953000, - "delayedUntil": 7953000, - "coolingDownUntil": 7953000, + "readyAt": 15153000, + "delayedUntil": 15153000, + "coolingDownUntil": 15153000, "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": 7303000, - "end": 7303000, + "start": 14503000, + "end": 14503000, "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": 7203000, - "end": 7203000, + "start": 14403000, + "end": 14403000, "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": 7203000, - "end": 7203000, + "start": 14403000, + "end": 14403000, "status": "success", "versions": { "targetPlatform": "6.1.0", @@ -756,7 +756,7 @@ ], "declared": true, "instance": "default", - "readyAt": 7203000, + "readyAt": 14403000, "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": 7203000, + "start": 14403000, "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": 7202000, + "end": 14402000, "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 2053b5a80b1..3a78f8c44a0 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": 7303000, - "end": 7303000, + "start": 14503000, + "end": 14503000, "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 285e7f14e8f..2601937faee 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": 7303000, - "end": 7303000, + "start": 14503000, + "end": 14503000, "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 2ad35968732..37ae9e4b56b 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": 7203000, - "end": 7203000, + "start": 14403000, + "end": 14403000, "wantedPlatform": "6.1", "wantedApplication": { "hash": "1.0.3-commit1", @@ -146,8 +146,8 @@ "4": { "id": 4, "status": "installationFailed", - "start": 7203000, - "end": 7203000, + "start": 14403000, + "end": 14403000, "wantedPlatform": "6.1", "wantedApplication": { "hash": "1.0.3-commit1", @@ -194,8 +194,8 @@ "5": { "id": 5, "status": "installationFailed", - "start": 7303000, - "end": 7303000, + "start": 14503000, + "end": 14503000, "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 a941b824b53..e8c8e57aa9f 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": 7303000, + "at": 14503000, "type": "info", "message": "No services requiring restart." }, { - "at": 7303000, + "at": 14503000, "type": "info", "message": "Deployment successful." }, { - "at": 7303000, + "at": 14503000, "type": "info", "message": "foo" } ], "installTester": [ { - "at": 7303000, + "at": 14503000, "type": "info", "message": "host-tenant:application:default-t-staging.us-east-3: unorchestrated" }, { - "at": 7303000, + "at": 14503000, "type": "info", "message": "--- platform dockerImage:6.1" }, { - "at": 7303000, + "at": 14503000, "type": "info", "message": "--- container on port 43 has config generation 1, wanted is 2" }, { - "at": 7303000, + "at": 14503000, "type": "info", "message": "host-tenant:application:default-t-staging.us-east-3: unorchestrated" }, { - "at": 7303000, + "at": 14503000, "type": "info", "message": "--- platform dockerImage:6.1" }, { - "at": 7303000, + "at": 14503000, "type": "info", "message": "--- container on port 43 has config generation 1, wanted is 2" }, { - "at": 7303000, + "at": 14503000, "type": "info", "message": "host-tenant:application:default-t-staging.us-east-3: unorchestrated" }, { - "at": 7303000, + "at": 14503000, "type": "info", "message": "--- platform dockerImage:6.1" }, { - "at": 7303000, + "at": 14503000, "type": "info", "message": "--- container on port 43 has config generation 1, wanted is 2" } ], "deployInitialReal": [ { - "at": 7303000, + "at": 14503000, "type": "info", "message": "Deploying platform version 6.1 and application version 1.0.1-commit1 ..." }, { - "at": 7303000, + "at": 14503000, "type": "info", "message": "No services requiring restart." }, { - "at": 7303000, + "at": 14503000, "type": "info", "message": "Deployment successful." }, { - "at": 7303000, + "at": 14503000, "type": "info", "message": "foo" } ], "installInitialReal": [ { - "at": 7303000, + "at": 14503000, "type": "info", "message": "######## Details for all nodes ########" }, { - "at": 7303000, + "at": 14503000, "type": "info", "message": "host-tenant:application:default-staging.us-east-3: unorchestrated" }, { - "at": 7303000, + "at": 14503000, "type": "info", "message": "--- platform dockerImage:6.1" }, { - "at": 7303000, + "at": 14503000, "type": "info", "message": "--- container on port 43 has config generation 1, wanted is 2" }, { - "at": 7303000, + "at": 14503000, "type": "info", "message": "Deployment expired before installation was successful." } ], "deactivateReal": [ { - "at": 7303000, + "at": 14503000, "type": "info", "message": "Deactivating deployment of tenant.application in staging.us-east-3 ..." } ], "deactivateTester": [ { - "at": 7303000, + "at": 14503000, "type": "info", "message": "Deactivating tester of tenant.application in staging.us-east-3 ..." } @@ -134,19 +134,19 @@ "steps": { "deployTester": { "status": "succeeded", - "startMillis": 7303000 + "startMillis": 14503000 }, "installTester": { "status": "unfinished", - "startMillis": 7303000 + "startMillis": 14503000 }, "deployInitialReal": { "status": "succeeded", - "startMillis": 7303000 + "startMillis": 14503000 }, "installInitialReal": { "status": "failed", - "startMillis": 7303000, + "startMillis": 14503000, "convergence": { "nodes": 1, "down": 0, @@ -182,19 +182,19 @@ }, "copyVespaLogs": { "status": "succeeded", - "startMillis": 7303000 + "startMillis": 14503000 }, "deactivateReal": { "status": "succeeded", - "startMillis": 7303000 + "startMillis": 14503000 }, "deactivateTester": { "status": "succeeded", - "startMillis": 7303000 + "startMillis": 14503000 }, "report": { "status": "succeeded", - "startMillis": 7303000 + "startMillis": 14503000 } } } |