Rename MutableStatusService to ApplicationLock

The result of acquiring the application lock in the status service is now named
ApplicationLock instead of MutableStatusService.

5 files changed, 31 insertions, 35 deletions

diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java
index 3f560a3e274..f7c5ab15927 100644
--- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java
+++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java
@@ -27,7 +27,7 @@ import com.yahoo.vespa.orchestrator.policy.HostStateChangeDeniedException;
 import com.yahoo.vespa.orchestrator.policy.HostedVespaClusterPolicy;
 import com.yahoo.vespa.orchestrator.policy.HostedVespaPolicy;
 import com.yahoo.vespa.orchestrator.status.HostStatus;
-import com.yahoo.vespa.orchestrator.status.MutableStatusService;
+import com.yahoo.vespa.orchestrator.status.ApplicationLock;
 import com.yahoo.vespa.orchestrator.status.StatusService;
 import com.yahoo.vespa.orchestrator.status.ZkStatusService;
 import com.yahoo.vespa.service.model.ServiceModelCache;
@@ -336,13 +336,12 @@ public class OrchestratorImplTest {
         var clusterControllerClientFactory = mock(ClusterControllerClientFactory.class);
         var clock = new ManualClock();
         var applicationApiFactory = mock(ApplicationApiFactory.class);
-        var hostStatusRegistry = mock(MutableStatusService.class);
+        var lock = mock(ApplicationLock.class);
 
         when(instanceLookupService.findInstanceByHost(any())).thenReturn(Optional.of(applicationInstance));
         when(applicationInstance.reference()).thenReturn(applicationInstanceReference);
-        when(zookeeperStatusService.lockApplication(any(), any()))
-                .thenReturn(hostStatusRegistry);
-        when(hostStatusRegistry.getStatus()).thenReturn(NO_REMARKS);
+        when(zookeeperStatusService.lockApplication(any(), any())).thenReturn(lock);
+        when(lock.getApplicationInstanceStatus()).thenReturn(NO_REMARKS);
 
         var orchestrator = new OrchestratorImpl(
                 policy,
@@ -372,17 +371,17 @@ public class OrchestratorImplTest {
         verify(applicationApiFactory, times(2)).create(any(), any(), any());
         verify(policy, times(2)).grantSuspensionRequest(any(), any());
         verify(instanceLookupService, atLeastOnce()).findInstanceByHost(any());
-        verify(hostStatusRegistry, times(2)).getStatus();
+        verify(lock, times(2)).getApplicationInstanceStatus();
 
         // Each zookeeperStatusService that is created, is closed.
         verify(zookeeperStatusService, times(2)).lockApplication(any(), any());
-        verify(hostStatusRegistry, times(2)).close();
+        verify(lock, times(2)).close();
 
         verifyNoMoreInteractions(
                 policy,
                 clusterControllerClientFactory,
                 zookeeperStatusService,
-                hostStatusRegistry,
+                lock,
                 instanceLookupService,
                 applicationApiFactory);
     }
diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ModelTestUtils.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ModelTestUtils.java
index b37d3fc3850..24a85bfa244 100644
--- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ModelTestUtils.java
+++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ModelTestUtils.java
@@ -29,7 +29,7 @@ import com.yahoo.vespa.orchestrator.policy.HostedVespaPolicy;
 import com.yahoo.vespa.orchestrator.status.HostInfo;
 import com.yahoo.vespa.orchestrator.status.HostInfos;
 import com.yahoo.vespa.orchestrator.status.HostStatus;
-import com.yahoo.vespa.orchestrator.status.MutableStatusService;
+import com.yahoo.vespa.orchestrator.status.ApplicationLock;
 import com.yahoo.vespa.orchestrator.status.StatusService;
 import com.yahoo.vespa.orchestrator.status.ZkStatusService;
 import com.yahoo.vespa.service.model.ServiceModelCache;
@@ -114,10 +114,10 @@ class ModelTestUtils {
             ApplicationInstance applicationInstance,
             HostName... hostnames) {
         NodeGroup nodeGroup = new NodeGroup(applicationInstance, hostnames);
-        MutableStatusService registry = statusService.lockApplication(
+        ApplicationLock lock = statusService.lockApplication(
                 OrchestratorContext.createContextForSingleAppOp(Clock.systemUTC()),
                 applicationInstance.reference());
-        return applicationApiFactory().create(nodeGroup, registry, clusterControllerClientFactory);
+        return applicationApiFactory().create(nodeGroup, lock, clusterControllerClientFactory);
     }
 
     ApplicationInstance createApplicationInstance(
diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/HostResourceTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/HostResourceTest.java
index df5f31c8e47..9133a3bbf2c 100644
--- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/HostResourceTest.java
+++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/HostResourceTest.java
@@ -39,7 +39,7 @@ import com.yahoo.vespa.orchestrator.restapi.wire.PatchHostResponse;
 import com.yahoo.vespa.orchestrator.restapi.wire.UpdateHostResponse;
 import com.yahoo.vespa.orchestrator.status.HostInfo;
 import com.yahoo.vespa.orchestrator.status.HostStatus;
-import com.yahoo.vespa.orchestrator.status.MutableStatusService;
+import com.yahoo.vespa.orchestrator.status.ApplicationLock;
 import com.yahoo.vespa.orchestrator.status.StatusService;
 import com.yahoo.vespa.orchestrator.status.ZkStatusService;
 import org.junit.Before;
@@ -134,7 +134,7 @@ public class HostResourceTest {
         public void releaseSuspensionGrant(
                 OrchestratorContext context, ApplicationInstance applicationInstance,
                 HostName hostName,
-                MutableStatusService hostStatusRegistry) {
+                ApplicationLock hostStatusRegistry) {
         }
     }
 
@@ -236,7 +236,7 @@ public class HostResourceTest {
         public void releaseSuspensionGrant(
                 OrchestratorContext context, ApplicationInstance applicationInstance,
                 HostName hostName,
-                MutableStatusService hostStatusRegistry) throws HostStateChangeDeniedException {
+                ApplicationLock hostStatusRegistry) throws HostStateChangeDeniedException {
             doThrow();
         }
 
diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusService2Test.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusService2Test.java
index 10556a15c51..c5d390050ee 100644
--- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusService2Test.java
+++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusService2Test.java
@@ -50,7 +50,7 @@ public class ZkStatusService2Test {
 
         when(context.getTimeLeft()).thenReturn(Duration.ofSeconds(12));
 
-        try (MutableStatusService registry = zkStatusService.lockApplication(context, reference)) {
+        try (ApplicationLock lock = zkStatusService.lockApplication(context, reference)) {
             // nothing
         }
 
@@ -65,7 +65,7 @@ public class ZkStatusService2Test {
 
         when(context.isProbe()).thenReturn(false);
 
-        try (MutableStatusService registry = zkStatusService.lockApplication(context, reference)) {
+        try (ApplicationLock lock = zkStatusService.lockApplication(context, reference)) {
             // nothing
         }
 
@@ -88,7 +88,7 @@ public class ZkStatusService2Test {
 
         when(context.getTimeLeft()).thenReturn(Duration.ofSeconds(12));
 
-        try (MutableStatusService registry = zkStatusService.lockApplication(context, reference)) {
+        try (ApplicationLock lock = zkStatusService.lockApplication(context, reference)) {
             // nothing
         }
 
@@ -105,7 +105,7 @@ public class ZkStatusService2Test {
         when(context.hasLock(any())).thenReturn(true);
         when(context.registerLockAcquisition(any(), any())).thenReturn(false);
 
-        try (MutableStatusService registry = zkStatusService.lockApplication(context, reference)) {
+        try (ApplicationLock lock = zkStatusService.lockApplication(context, reference)) {
             // nothing
         }
 
diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusServiceTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusServiceTest.java
index 48d50946e51..a6d7f09d69b 100644
--- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusServiceTest.java
+++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/status/ZkStatusServiceTest.java
@@ -107,17 +107,14 @@ public class ZkStatusServiceTest {
                 Instant.ofEpochMilli((3)),
                 Instant.ofEpochMilli(6));
 
-        try (MutableStatusService statusRegistry = zkStatusService
-                .lockApplication(context, TestIds.APPLICATION_INSTANCE_REFERENCE)) {
+        try (ApplicationLock lock = zkStatusService.lockApplication(context, TestIds.APPLICATION_INSTANCE_REFERENCE)) {
 
             //shuffling to catch "clean database" failures for all cases.
             for (HostStatus hostStatus: shuffledList(HostStatus.NO_REMARKS, HostStatus.ALLOWED_TO_BE_DOWN)) {
                 for (int i = 0; i < 2; i++) {
-                    statusRegistry.setHostState(
-                            TestIds.HOST_NAME1,
-                            hostStatus);
+                    lock.setHostState(TestIds.HOST_NAME1, hostStatus);
 
-                    assertThat(statusRegistry.getHostInfos().getOrNoRemarks(TestIds.HOST_NAME1).status(),
+                    assertThat(lock.getHostInfos().getOrNoRemarks(TestIds.HOST_NAME1).status(),
                                is(hostStatus));
                 }
             }
@@ -144,11 +141,11 @@ public class ZkStatusServiceTest {
         ZkStatusService zkStatusService2 = new ZkStatusService(curator, mock(Metric.class), new TestTimer());
 
         final CompletableFuture<Void> lockedSuccessfullyFuture;
-        try (MutableStatusService statusRegistry = zkStatusService
+        try (ApplicationLock lock = zkStatusService
                 .lockApplication(context, TestIds.APPLICATION_INSTANCE_REFERENCE)) {
 
             lockedSuccessfullyFuture = CompletableFuture.runAsync(() -> {
-                try (MutableStatusService statusRegistry2 = zkStatusService2
+                try (ApplicationLock lock2 = zkStatusService2
                         .lockApplication(context, TestIds.APPLICATION_INSTANCE_REFERENCE))
                 {
                 }
@@ -168,7 +165,7 @@ public class ZkStatusServiceTest {
     public void failing_to_get_lock_closes_SessionFailRetryLoop() throws Exception {
         ZkStatusService zkStatusService2 = new ZkStatusService(curator, mock(Metric.class), new TestTimer());
 
-        try (MutableStatusService statusRegistry = zkStatusService
+        try (ApplicationLock lock = zkStatusService
                 .lockApplication(context, TestIds.APPLICATION_INSTANCE_REFERENCE)) {
 
             //must run in separate thread, since having 2 locks in the same thread fails
@@ -182,7 +179,7 @@ public class ZkStatusServiceTest {
                 killSession(curator.framework(), testingServer);
 
                 //Throws SessionFailedException if the SessionFailRetryLoop has not been closed.
-                statusRegistry.getHostInfos().getOrNoRemarks(TestIds.HOST_NAME1);
+                lock.getHostInfos().getOrNoRemarks(TestIds.HOST_NAME1);
             });
 
             assertThat(resultOfZkOperationAfterLockFailure, notHoldsException());
@@ -244,9 +241,9 @@ public class ZkStatusServiceTest {
                 is(ApplicationInstanceStatus.NO_REMARKS));
 
         // Suspend
-        try (MutableStatusService statusRegistry = zkStatusService
+        try (ApplicationLock lock = zkStatusService
                 .lockApplication(context, TestIds.APPLICATION_INSTANCE_REFERENCE)) {
-            statusRegistry.setApplicationInstanceStatus(ApplicationInstanceStatus.ALLOWED_TO_BE_DOWN);
+            lock.setApplicationInstanceStatus(ApplicationInstanceStatus.ALLOWED_TO_BE_DOWN);
         }
 
         assertThat(
@@ -255,9 +252,9 @@ public class ZkStatusServiceTest {
                 is(ApplicationInstanceStatus.ALLOWED_TO_BE_DOWN));
 
         // Resume
-        try (MutableStatusService statusRegistry = zkStatusService
+        try (ApplicationLock lock = zkStatusService
                 .lockApplication(context, TestIds.APPLICATION_INSTANCE_REFERENCE)) {
-            statusRegistry.setApplicationInstanceStatus(ApplicationInstanceStatus.NO_REMARKS);
+            lock.setApplicationInstanceStatus(ApplicationInstanceStatus.NO_REMARKS);
         }
 
         assertThat(
@@ -272,14 +269,14 @@ public class ZkStatusServiceTest {
                 = zkStatusService.getAllSuspendedApplications();
         assertThat(suspendedApps.size(), is(0));
 
-        try (MutableStatusService statusRegistry = zkStatusService
+        try (ApplicationLock statusRegistry = zkStatusService
                 .lockApplication(context, TestIds.APPLICATION_INSTANCE_REFERENCE)) {
             statusRegistry.setApplicationInstanceStatus(ApplicationInstanceStatus.ALLOWED_TO_BE_DOWN);
         }
 
-        try (MutableStatusService statusRegistry = zkStatusService
+        try (ApplicationLock lock = zkStatusService
                 .lockApplication(context, TestIds.APPLICATION_INSTANCE_REFERENCE2)) {
-            statusRegistry.setApplicationInstanceStatus(ApplicationInstanceStatus.ALLOWED_TO_BE_DOWN);
+            lock.setApplicationInstanceStatus(ApplicationInstanceStatus.ALLOWED_TO_BE_DOWN);
         }
 
         suspendedApps = zkStatusService.getAllSuspendedApplications();