From 73820316768b152a4d5766270b8a084f3a146dd6 Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Fri, 20 Sep 2019 11:04:47 +0200 Subject: Replace some LockedInstance usages with LockedApplication, and remove unused methods --- .../vespa/hosted/controller/LockedInstance.java | 34 ---------------------- .../controller/deployment/DeploymentTrigger.java | 2 +- .../controller/deployment/JobController.java | 3 +- .../maintenance/DeploymentIssueReporter.java | 2 +- .../restapi/application/ApplicationApiTest.java | 2 +- 5 files changed, 4 insertions(+), 39 deletions(-) (limited to 'controller-server') diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedInstance.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedInstance.java index 26eacbbf4f4..4de1b7ac7ac 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedInstance.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedInstance.java @@ -103,27 +103,6 @@ public class LockedInstance { rotations, rotationStatus); } - public LockedInstance withBuiltInternally(boolean builtInternally) { - return new LockedInstance(lock, id, createdAt, deploymentSpec, validationOverrides, deployments, - deploymentJobs.withBuiltInternally(builtInternally), change, outstandingChange, - ownershipIssueId, owner, majorVersion, metrics, pemDeployKey, - rotations, rotationStatus); - } - - public LockedInstance withProjectId(OptionalLong projectId) { - return new LockedInstance(lock, id, createdAt, deploymentSpec, validationOverrides, deployments, - deploymentJobs.withProjectId(projectId), change, outstandingChange, - ownershipIssueId, owner, majorVersion, metrics, pemDeployKey, - rotations, rotationStatus); - } - - public LockedInstance withDeploymentIssueId(IssueId issueId) { - return new LockedInstance(lock, id, createdAt, deploymentSpec, validationOverrides, deployments, - deploymentJobs.with(issueId), change, outstandingChange, - ownershipIssueId, owner, majorVersion, metrics, pemDeployKey, - rotations, rotationStatus); - } - public LockedInstance withJobPause(JobType jobType, OptionalLong pausedUntil) { return new LockedInstance(lock, id, createdAt, deploymentSpec, validationOverrides, deployments, deploymentJobs.withPause(jobType, pausedUntil), change, outstandingChange, @@ -197,19 +176,6 @@ public class LockedInstance { rotations, rotationStatus); } - public LockedInstance with(DeploymentSpec deploymentSpec) { - return new LockedInstance(lock, id, createdAt, deploymentSpec, validationOverrides, deployments, - deploymentJobs, change, outstandingChange, - ownershipIssueId, owner, majorVersion, metrics, pemDeployKey, - rotations, rotationStatus); - } - - public LockedInstance with(ValidationOverrides validationOverrides) { - return new LockedInstance(lock, id, createdAt, deploymentSpec, validationOverrides, deployments, - deploymentJobs, change, outstandingChange, ownershipIssueId, owner, majorVersion, - metrics, pemDeployKey, rotations, rotationStatus); - } - public LockedInstance withChange(Change change) { return new LockedInstance(lock, id, createdAt, deploymentSpec, validationOverrides, deployments, deploymentJobs, change, outstandingChange, ownershipIssueId, owner, majorVersion, diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java index 7ccb4163284..1eedb3d2c52 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java @@ -201,7 +201,7 @@ public class DeploymentTrigger { catch (RuntimeException e) { log.log(LogLevel.WARNING, "Exception triggering " + job + ": " + e); if (e instanceof NoSuchElementException || e instanceof IllegalArgumentException) - applications().lockOrThrow(job.applicationId(), application -> + applications().lockApplicationOrThrow(job.applicationId(), application -> applications().store(application.withProjectId(OptionalLong.empty()))); return false; } 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 61345539552..cb90d2bf31e 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 @@ -13,7 +13,6 @@ import com.yahoo.vespa.flags.Flags; import com.yahoo.vespa.hosted.controller.Instance; import com.yahoo.vespa.hosted.controller.Controller; import com.yahoo.vespa.hosted.controller.LockedApplication; -import com.yahoo.vespa.hosted.controller.LockedInstance; import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId; import com.yahoo.vespa.hosted.controller.api.integration.LogEntry; import com.yahoo.vespa.hosted.controller.api.integration.configserver.NotFoundException; @@ -388,7 +387,7 @@ public class JobController { /** Unregisters the given application and makes all associated data eligible for garbage collection. */ public void unregister(ApplicationId id) { - controller.applications().lockIfPresent(id, application -> { + controller.applications().lockApplicationIfPresent(id, application -> { controller.applications().store(application.withBuiltInternally(false)); jobs(id).forEach(type -> last(id, type).ifPresent(last -> abort(last.id()))); }); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporter.java index 11c210adc48..56df43d707c 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporter.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporter.java @@ -142,7 +142,7 @@ public class DeploymentIssueReporter extends Maintainer { } private void store(ApplicationId id, IssueId issueId) { - controller().applications().lockIfPresent(id, application -> + controller().applications().lockApplicationIfPresent(id, application -> controller().applications().store(application.withDeploymentIssueId(issueId))); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java index 474944432fb..6eaccc3038b 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java @@ -681,7 +681,7 @@ public class ApplicationApiTest extends ControllerContainerTest { } private void addIssues(ContainerControllerTester tester, ApplicationId id) { - tester.controller().applications().lockOrThrow(id, application -> + tester.controller().applications().lockApplicationOrThrow(id, application -> tester.controller().applications().store(application.withDeploymentIssueId(IssueId.from("123")) .withOwnershipIssueId(IssueId.from("321")) .withOwner(User.from("owner-username")))); -- cgit v1.2.3