diff options
| author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-11-09 11:38:11 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-11-09 11:38:11 +0100 |
| commit | dae93df2d85eb7fd67836aa7e644aa3cd5b5f9f7 (patch) | |
| tree | c85242eaee7789a663781c9fc750c0a78b32c8be /controller-server | |
| parent | c7157de0668b562ed75ce1fd9dc6ce12ea512472 (diff) | |
One more usage
Diffstat (limited to 'controller-server')
2 files changed, 4 insertions, 4 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 aa0bdfeb008..f1148858aab 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 @@ -409,7 +409,7 @@ public class InternalStepRunner implements StepRunner { private Optional<RunStatus> deactivateTester(RunId id, DualLogger logger) { logger.log("Deactivating tester of " + id.application() + " in " + id.type().zone(controller.system()) + " ..."); - controller.jobController().deactivateTester(id.application(), id.type()); + controller.jobController().deactivateTester(id.tester(), id.type()); return Optional.of(running); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java index 8ac7ab6efa5..2980f008d9f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java @@ -298,7 +298,7 @@ public class JobController { for (JobType type : jobs(id)) locked(id, type, deactivateTester, __ -> { try (Lock ___ = curator.lock(id, type)) { - deactivateTester(id, type); + deactivateTester(TesterId.of(id), type); curator.deleteRunData(id, type); logs.delete(id); } @@ -311,9 +311,9 @@ public class JobController { }); } - public void deactivateTester(ApplicationId id, JobType type) { + public void deactivateTester(TesterId id, JobType type) { try { - controller.configServer().deactivate(new DeploymentId(TesterId.of(id).id(), type.zone(controller.system()))); + controller.configServer().deactivate(new DeploymentId(id.id(), type.zone(controller.system()))); } catch (NoInstanceException ignored) { // Already gone -- great! |