Merge pull request #9040 from vespa-engine/hmusum/fix-config-model-inconsistency-2

Minor refactoring, and some renaming

14 files changed, 74 insertions, 68 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index c4b1d0f7c86..53d20379989 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -301,12 +301,12 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
         if (tenant == null) return false;
 
         TenantApplications tenantApplications = tenant.getApplicationRepo();
-        if (!tenantApplications.listApplications().contains(applicationId)) return false;
+        if (!tenantApplications.activeApplications().contains(applicationId)) return false;
 
         // Deleting an application is done by deleting the remote session and waiting
         // until the config server where the deployment happened picks it up and deletes
         // the local session
-        long sessionId = tenantApplications.getSessionIdForApplication(applicationId);
+        long sessionId = tenantApplications.requireActiveSessionOf(applicationId);
         RemoteSession remoteSession = getRemoteSession(tenant, sessionId);
         remoteSession.createDeleteTransaction().commit();
 
@@ -324,7 +324,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
         transaction.add(new Rotations(tenant.getCurator(), tenant.getPath()).delete(applicationId)); // TODO: Not unit tested
         // (When rotations are updated in zk, we need to redeploy the zone app, on the right config server
         // this is done asynchronously in application maintenance by the node repository)
-        transaction.add(tenantApplications.deleteApplication(applicationId));
+        transaction.add(tenantApplications.createDeleteTransaction(applicationId));
 
         hostProvisioner.ifPresent(provisioner -> provisioner.remove(transaction, applicationId));
         transaction.onCommitted(() -> log.log(LogLevel.INFO, "Deleted " + applicationId));
@@ -425,7 +425,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
 
     Set<ApplicationId> listApplications() {
         return tenantRepository.getAllTenants().stream()
-                .flatMap(tenant -> tenant.getApplicationRepo().listApplications().stream())
+                .flatMap(tenant -> tenant.getApplicationRepo().activeApplications().stream())
                 .collect(Collectors.toSet());
     }
 
@@ -483,7 +483,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
         if (applicationRepo == null)
             throw new IllegalArgumentException("Application repo for tenant '" + tenant.getName() + "' not found");
 
-        return applicationRepo.getSessionIdForApplication(applicationId);
+        return applicationRepo.requireActiveSessionOf(applicationId);
     }
 
     public void validateThatRemoteSessionIsNotActive(Tenant tenant, long sessionId) {
@@ -565,7 +565,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
     }
 
     private List<ApplicationId> activeApplications(TenantName tenantName) {
-        return tenantRepository.getTenant(tenantName).getApplicationRepo().listApplications();
+        return tenantRepository.getTenant(tenantName).getApplicationRepo().activeApplications();
     }
 
     // ---------------- Misc operations ----------------------------------------------------------------
@@ -616,7 +616,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
         Optional<ApplicationSet> currentActiveApplicationSet = Optional.empty();
         TenantApplications applicationRepo = tenant.getApplicationRepo();
         try {
-            long currentActiveSessionId = applicationRepo.getSessionIdForApplication(appId);
+            long currentActiveSessionId = applicationRepo.requireActiveSessionOf(appId);
             RemoteSession currentActiveSession = getRemoteSession(tenant, currentActiveSessionId);
             if (currentActiveSession != null) {
                 currentActiveApplicationSet = Optional.ofNullable(currentActiveSession.ensureApplicationLoaded());
@@ -646,7 +646,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
 
     private List<ApplicationId> listApplicationIds(Tenant tenant) {
         TenantApplications applicationRepo = tenant.getApplicationRepo();
-        return applicationRepo.listApplications();
+        return applicationRepo.activeApplications();
     }
 
     private void cleanupTempDirectory(File tempDir) {
@@ -658,13 +658,13 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
 
     private LocalSession getExistingSession(Tenant tenant, ApplicationId applicationId) {
         TenantApplications applicationRepo = tenant.getApplicationRepo();
-        return getLocalSession(tenant, applicationRepo.getSessionIdForApplication(applicationId));
+        return getLocalSession(tenant, applicationRepo.requireActiveSessionOf(applicationId));
     }
 
     private LocalSession getActiveSession(Tenant tenant, ApplicationId applicationId) {
         TenantApplications applicationRepo = tenant.getApplicationRepo();
-        if (applicationRepo.listApplications().contains(applicationId)) {
-            return tenant.getLocalSessionRepo().getSession(applicationRepo.getSessionIdForApplication(applicationId));
+        if (applicationRepo.activeApplications().contains(applicationId)) {
+            return tenant.getLocalSessionRepo().getSession(applicationRepo.requireActiveSessionOf(applicationId));
         }
         return null;
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
index 3705a0ec145..656030bb8d2 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
@@ -17,18 +17,19 @@ import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
 
 import java.util.List;
+import java.util.OptionalLong;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * The applications of a tenant, backed by ZooKeeper.
  *
- * Each application is stored as a single node under /config/v2/tenants/&lt;tenant&gt;/applications/&lt;applications&gt;,
- * named the same as the application id and containing the id of the session storing the content of the application.
+ * Each application is stored under /config/v2/tenants/&lt;tenant&gt;/applications/&lt;applications&gt;,
+ * the root contains the currently active session, if any, and sub-paths /preparing contains the session id
+ * of whatever session may be activated next, if any, and /lock is used for synchronizing writes to all these paths.
  *
  * @author Ulf Lilleengen
  */
@@ -69,16 +70,18 @@ public class TenantApplications {
      *
      * @return a list of {@link ApplicationId}s that are active.
      */
-    public List<ApplicationId> listApplications() {
+    public List<ApplicationId> activeApplications() {
         return curator.getChildren(applicationsPath).stream()
-                      .flatMap(this::parseApplication)
+                      .filter(this::isValid)
+                      .map(ApplicationId::fromSerializedForm)
+                      .filter(id -> activeSessionOf(id).isPresent())
                       .collect(Collectors.toUnmodifiableList());
     }
 
-    // TODO jvenstad: Remove after it has run once everywhere.
-    private Stream<ApplicationId> parseApplication(String appNode) {
+    private boolean isValid(String appNode) { // TODO jvenstad: Remove after it has run once everywhere.
         try {
-            return Stream.of(ApplicationId.fromSerializedForm(appNode));
+            ApplicationId.fromSerializedForm(appNode);
+            return true;
         } catch (IllegalArgumentException __) {
             log.log(LogLevel.INFO, TenantRepository.logPre(tenant) + "Unable to parse application id from '" +
                     appNode + "'; deleting it as it shouldn't be here.");
@@ -88,18 +91,25 @@ public class TenantApplications {
             catch (Exception e) {
                 log.log(LogLevel.WARNING, TenantRepository.logPre(tenant) + "Failed to clean up stray node '" + appNode + "'!", e);
             }
-            return Stream.empty();
+            return false;
         }
     }
 
+    /** Returns the id of the currently active session for the given application, if any. Throws on unknown applications. */
+    public OptionalLong activeSessionOf(ApplicationId id) {
+        String data = curator.getData(applicationPath(id)).map(Utf8::toString)
+                             .orElseThrow(() -> new IllegalArgumentException("Unknown application '" + id + "'."));
+        return data.isEmpty() ? OptionalLong.empty() : OptionalLong.of(Long.parseLong(data));
+    }
+
     /**
      * Returns a transaction which writes the given session id as the currently active for the given application.
      *
      * @param applicationId An {@link ApplicationId} that represents an active application.
      * @param sessionId Id of the session containing the application package for this id.
      */
-    public Transaction createPutApplicationTransaction(ApplicationId applicationId, long sessionId) {
-        if (listApplications().contains(applicationId)) {
+    public Transaction createPutTransaction(ApplicationId applicationId, long sessionId) {
+        if (curator.exists(applicationPath(applicationId))) {
             return new CuratorTransaction(curator).add(CuratorOperations.setData(applicationPath(applicationId).getAbsolute(), Utf8.toAsciiBytes(sessionId)));
         } else {
             return new CuratorTransaction(curator).add(CuratorOperations.create(applicationPath(applicationId).getAbsolute(), Utf8.toAsciiBytes(sessionId)));
@@ -107,25 +117,21 @@ public class TenantApplications {
     }
 
     /**
-     * Return the stored session id for a given application.
+     * Return the active session id for a given application.
      *
      * @param  applicationId an {@link ApplicationId}
      * @return session id of given application id.
      * @throws IllegalArgumentException if the application does not exist
      */
-    public long getSessionIdForApplication(ApplicationId applicationId) {
-        String path = applicationPath(applicationId).getAbsolute();
-        try {
-            return Long.parseLong(Utf8.toString(curator.framework().getData().forPath(path)));
-        } catch (Exception e) {
-            throw new IllegalArgumentException(TenantRepository.logPre(applicationId) + "Unable to read the session id from '" + path + "'", e);
-        }
+    public long requireActiveSessionOf(ApplicationId applicationId) {
+        return activeSessionOf(applicationId)
+                .orElseThrow(() -> new IllegalArgumentException("Application '" + applicationId + "' has no active session."));
     }
 
     /**
      * Returns a transaction which deletes this application.
      */
-    public CuratorTransaction deleteApplication(ApplicationId applicationId) {
+    public CuratorTransaction createDeleteTransaction(ApplicationId applicationId) {
         return CuratorTransaction.from(CuratorOperations.delete(applicationPath(applicationId).getAbsolute()), curator);
     }
 
@@ -133,7 +139,7 @@ public class TenantApplications {
      * Removes all applications not known to this from the config server state.
      */
     public void removeUnusedApplications() {
-        reloadHandler.removeApplicationsExcept(Set.copyOf(listApplications()));
+        reloadHandler.removeApplicationsExcept(Set.copyOf(activeApplications()));
     }
 
     /**
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandler.java
index 6345532d4ff..cdf995b80bb 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandler.java
@@ -56,7 +56,7 @@ public class ListApplicationsHandler extends HttpHandler {
         Utils.checkThatTenantExists(tenantRepository, tenantName);
         Tenant tenant = tenantRepository.getTenant(tenantName);
         TenantApplications applicationRepo = tenant.getApplicationRepo();
-        return applicationRepo.listApplications();
+        return applicationRepo.activeApplications();
     }
 
     private static String createUrlStringFromId(String urlBase, ApplicationId id, Zone zone) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java
index 0cdf5ebfe95..af8956803ab 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java
@@ -95,7 +95,7 @@ public class LocalSession extends Session implements Comparable<LocalSession> {
         zooKeeperClient.createActiveWaiter();
         superModelGenerationCounter.increment(); // TODO jvenstad: I hope this counter isn't used for serious things, as it's updated way ahead of activation.
         Transaction transaction = createSetStatusTransaction(Status.ACTIVATE);
-        transaction.add(applicationRepo.createPutApplicationTransaction(zooKeeperClient.readApplicationId(), getSessionId()).operations());
+        transaction.add(applicationRepo.createPutTransaction(zooKeeperClient.readApplicationId(), getSessionId()).operations());
         return transaction;
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java
index 15182813a22..ccd5684b9ff 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java
@@ -190,9 +190,9 @@ public class RemoteSessionRepo extends SessionRepo<RemoteSession> {
     }
 
     private void loadSessionIfActive(RemoteSession session) {
-        for (ApplicationId applicationId : applicationRepo.listApplications()) {
+        for (ApplicationId applicationId : applicationRepo.activeApplications()) {
             try {
-                if (applicationRepo.getSessionIdForApplication(applicationId) == session.getSessionId()) {
+                if (applicationRepo.requireActiveSessionOf(applicationId) == session.getSessionId()) {
                     log.log(LogLevel.DEBUG, "Found active application for session " + session.getSessionId() + " , loading it");
                     loadActiveSession(session);
                     break;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactoryImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactoryImpl.java
index 90eeb89dc8e..d8ba5890545 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactoryImpl.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactoryImpl.java
@@ -188,9 +188,9 @@ public class SessionFactoryImpl implements SessionFactory, LocalSessionLoader {
     }
 
     private long getActiveSessionId(ApplicationId applicationId) {
-        List<ApplicationId> applicationIds = applicationRepo.listApplications();
+        List<ApplicationId> applicationIds = applicationRepo.activeApplications();
         if (applicationIds.contains(applicationId)) {
-            return applicationRepo.getSessionIdForApplication(applicationId);
+            return applicationRepo.requireActiveSessionOf(applicationId);
         }
         return nonExistingActiveSession;
     }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
index 5d356ddf88e..e0fa760b35d 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
@@ -315,7 +315,7 @@ public class ApplicationRepositoryTest {
 
         assertTrue(deployment2.isPresent());
         deployment2.get().activate(); // session 3
-        long activeSessionId = tester.tenant().getApplicationRepo().getSessionIdForApplication(tester.applicationId());
+        long activeSessionId = tester.tenant().getApplicationRepo().requireActiveSessionOf(tester.applicationId());
 
         clock.advance(Duration.ofSeconds(10));
         Optional<com.yahoo.config.provision.Deployment> deployment3 = tester.redeployFromLocalActive();
@@ -325,7 +325,7 @@ public class ApplicationRepositoryTest {
         LocalSession deployment3session = ((com.yahoo.vespa.config.server.deploy.Deployment) deployment3.get()).session();
         assertNotEquals(activeSessionId, deployment3session);
         // No change to active session id
-        assertEquals(activeSessionId, tester.tenant().getApplicationRepo().getSessionIdForApplication(tester.applicationId()));
+        assertEquals(activeSessionId, tester.tenant().getApplicationRepo().requireActiveSessionOf(tester.applicationId()));
         assertEquals(3, tester.tenant().getLocalSessionRepo().listSessions().size());
 
         clock.advance(Duration.ofHours(1)); // longer than session lifetime
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java
index a708e4d8ace..01a7d5e0239 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/TenantApplicationsTest.java
@@ -39,12 +39,12 @@ public class TenantApplicationsTest {
         writeApplicationData(createApplicationId("foo"), 3L);
         writeApplicationData(createApplicationId("bar"), 4L);
         TenantApplications repo = createZKAppRepo();
-        List<ApplicationId> applications = repo.listApplications();
+        List<ApplicationId> applications = repo.activeApplications();
         assertThat(applications.size(), is(2));
         assertThat(applications.get(0).application().value(), is("foo"));
         assertThat(applications.get(1).application().value(), is("bar"));
-        assertThat(repo.getSessionIdForApplication(applications.get(0)), is(3L));
-        assertThat(repo.getSessionIdForApplication(applications.get(1)), is(4L));
+        assertThat(repo.requireActiveSessionOf(applications.get(0)), is(3L));
+        assertThat(repo.requireActiveSessionOf(applications.get(1)), is(4L));
     }
 
     @Test
@@ -52,7 +52,7 @@ public class TenantApplicationsTest {
         writeApplicationData(createApplicationId("foo"), 3L);
         writeApplicationData("invalid", 3L);
         TenantApplications repo = createZKAppRepo();
-        List<ApplicationId> applications = repo.listApplications();
+        List<ApplicationId> applications = repo.activeApplications();
         assertThat(applications.size(), is(1));
         assertThat(applications.get(0).application().value(), is("foo"));
     }
@@ -60,7 +60,7 @@ public class TenantApplicationsTest {
     @Test(expected = IllegalArgumentException.class)
     public void require_that_requesting_session_for_unknown_application_throws_exception() throws Exception {
         TenantApplications repo = createZKAppRepo();
-        repo.getSessionIdForApplication(createApplicationId("nonexistent"));
+        repo.requireActiveSessionOf(createApplicationId("nonexistent"));
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -70,18 +70,18 @@ public class TenantApplicationsTest {
         curatorFramework.create().creatingParentsIfNeeded()
                 .forPath(TenantRepository.getApplicationsPath(tenantName).append(baz.serializedForm()).getAbsolute());
         TenantApplications repo = createZKAppRepo();
-        repo.getSessionIdForApplication(baz);
+        repo.requireActiveSessionOf(baz);
     }
 
     @Test
     public void require_that_application_ids_can_be_written() throws Exception {
         TenantApplications repo = createZKAppRepo();
         ApplicationId myapp = createApplicationId("myapp");
-        repo.createPutApplicationTransaction(myapp, 3l).commit();
+        repo.createPutTransaction(myapp, 3l).commit();
         String path = TenantRepository.getApplicationsPath(tenantName).append(myapp.serializedForm()).getAbsolute();
         assertTrue(curatorFramework.checkExists().forPath(path) != null);
         assertThat(Utf8.toString(curatorFramework.getData().forPath(path)), is("3"));
-        repo.createPutApplicationTransaction(myapp, 5l).commit();
+        repo.createPutTransaction(myapp, 5l).commit();
         assertTrue(curatorFramework.checkExists().forPath(path) != null);
         assertThat(Utf8.toString(curatorFramework.getData().forPath(path)), is("5"));
     }
@@ -91,13 +91,13 @@ public class TenantApplicationsTest {
         TenantApplications repo = createZKAppRepo();
         ApplicationId id1 = createApplicationId("myapp");
         ApplicationId id2 = createApplicationId("myapp2");
-        repo.createPutApplicationTransaction(id1, 1).commit();
-        repo.createPutApplicationTransaction(id2, 1).commit();
-        assertThat(repo.listApplications().size(), is(2));
-        repo.deleteApplication(id1).commit();
-        assertThat(repo.listApplications().size(), is(1));
-        repo.deleteApplication(id2).commit();
-        assertThat(repo.listApplications().size(), is(0));
+        repo.createPutTransaction(id1, 1).commit();
+        repo.createPutTransaction(id2, 1).commit();
+        assertThat(repo.activeApplications().size(), is(2));
+        repo.createDeleteTransaction(id1).commit();
+        assertThat(repo.activeApplications().size(), is(1));
+        repo.createDeleteTransaction(id2).commit();
+        assertThat(repo.activeApplications().size(), is(0));
     }
 
     @Test
@@ -108,7 +108,7 @@ public class TenantApplicationsTest {
         MockReloadHandler reloadHandler = new MockReloadHandler();
         TenantApplications repo = createZKAppRepo(reloadHandler);
         assertNull(reloadHandler.lastRemoved);
-        repo.deleteApplication(foo).commit();
+        repo.createDeleteTransaction(foo).commit();
         long endTime = System.currentTimeMillis() + 60_000;
         while (System.currentTimeMillis() < endTime && reloadHandler.lastRemoved == null) {
             Thread.sleep(100);
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
index 7ffb9552cf8..6b67dcc4e9a 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
@@ -183,7 +183,7 @@ public class DeployTester {
     public AllocatedHosts getAllocatedHostsOf(ApplicationId applicationId) {
         Tenant tenant = tenant();
         LocalSession session = tenant.getLocalSessionRepo().getSession(tenant.getApplicationRepo()
-                                                                             .getSessionIdForApplication(applicationId));
+                                                                             .requireActiveSessionOf(applicationId));
         return session.getAllocatedHosts();
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java
index b0bb3bf244f..3d34a4eeaf5 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java
@@ -56,12 +56,12 @@ public class ApplicationContentHandlerTest extends ContentHandlerTestBase {
         session2 = new MockSession(2l, FilesApplicationPackage.fromFile(new File("src/test/apps/content")));
         Tenant tenant1 = tenantRepository.getTenant(tenantName1);
         tenant1.getLocalSessionRepo().addSession(session2);
-        tenant1.getApplicationRepo().createPutApplicationTransaction(idTenant1, 2l).commit();
+        tenant1.getApplicationRepo().createPutTransaction(idTenant1, 2l).commit();
 
         MockSession session3 = new MockSession(3l, FilesApplicationPackage.fromFile(new File("src/test/apps/content2")));
         Tenant tenant2 = tenantRepository.getTenant(tenantName2);
         tenant2.getLocalSessionRepo().addSession(session3);
-        tenant2.getApplicationRepo().createPutApplicationTransaction(idTenant2, 3l).commit();
+        tenant2.getApplicationRepo().createPutTransaction(idTenant2, 3l).commit();
 
         handler = new ApplicationHandler(ApplicationHandler.testOnlyContext(),
                                          Zone.defaultZone(),
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
index d3dcbcc2252..fa560ceae4d 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java
@@ -223,13 +223,13 @@ public class ApplicationHandlerTest {
     }
 
     private void deleteAndAssertOKResponseMocked(ApplicationId applicationId, boolean fullAppIdInUrl) throws IOException {
-        long sessionId = tenantRepository.getTenant(applicationId.tenant()).getApplicationRepo().getSessionIdForApplication(applicationId);
+        long sessionId = tenantRepository.getTenant(applicationId.tenant()).getApplicationRepo().requireActiveSessionOf(applicationId);
         deleteAndAssertResponse(applicationId, Zone.defaultZone(), Response.Status.OK, null, fullAppIdInUrl);
         assertNull(tenantRepository.getTenant(applicationId.tenant()).getLocalSessionRepo().getSession(sessionId));
     }
 
     private void deleteAndAssertOKResponse(Tenant tenant, ApplicationId applicationId) throws IOException {
-        long sessionId = tenant.getApplicationRepo().getSessionIdForApplication(applicationId);
+        long sessionId = tenant.getApplicationRepo().requireActiveSessionOf(applicationId);
         deleteAndAssertResponse(applicationId, Zone.defaultZone(), Response.Status.OK, null, true);
         assertNull(tenant.getLocalSessionRepo().getSession(sessionId));
     }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java
index 2d3dcc592f7..fb75e91dfd6 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/HostHandlerTest.java
@@ -46,7 +46,7 @@ public class HostHandlerTest {
     private HostHandler hostHandler;
 
     static void addMockApplication(Tenant tenant, ApplicationId applicationId, long sessionId) {
-        tenant.getApplicationRepo().createPutApplicationTransaction(applicationId, sessionId).commit();
+        tenant.getApplicationRepo().createPutTransaction(applicationId, sessionId).commit();
         ApplicationPackage app = FilesApplicationPackage.fromFile(testApp);
         tenant.getLocalSessionRepo().addSession(new SessionHandlerTest.MockSession(sessionId, app, applicationId));
         TestComponentRegistry componentRegistry = new TestComponentRegistry.Builder()
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java
index f57e7f09b39..b34f7a0c487 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java
@@ -51,12 +51,12 @@ public class ListApplicationsHandlerTest {
         final String url = "http://myhost:14000/application/v2/tenant/mytenant/application/";
         assertResponse(url, Response.Status.OK,
                 "[]");
-        applicationRepo.createPutApplicationTransaction(
+        applicationRepo.createPutTransaction(
                 new ApplicationId.Builder().tenant("tenant").applicationName("foo").instanceName("quux").build(),
                 1).commit();
         assertResponse(url, Response.Status.OK,
                 "[\"" + url + "foo/environment/dev/region/us-east/instance/quux\"]");
-        applicationRepo.createPutApplicationTransaction(
+        applicationRepo.createPutTransaction(
                 new ApplicationId.Builder().tenant("tenant").applicationName("bali").instanceName("quux").build(),
                 1).commit();
         assertResponse(url, Response.Status.OK,
@@ -82,10 +82,10 @@ public class ListApplicationsHandlerTest {
 
     @Test
     public void require_that_listing_works_with_multiple_tenants() throws Exception {
-        applicationRepo.createPutApplicationTransaction(new ApplicationId.Builder()
+        applicationRepo.createPutTransaction(new ApplicationId.Builder()
                 .tenant("tenant")
                 .applicationName("foo").instanceName("quux").build(), 1).commit();
-        applicationRepo2.createPutApplicationTransaction(new ApplicationId.Builder()
+        applicationRepo2.createPutTransaction(new ApplicationId.Builder()
                 .tenant("tenant")
                 .applicationName("quux").instanceName("foo").build(), 1).commit();
         String url = "http://myhost:14000/application/v2/tenant/mytenant/application/";
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java
index 927ac26b77d..bc509fcd802 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java
@@ -194,7 +194,7 @@ public class SessionCreateHandlerTest extends SessionHandlerTest {
                               .applicationName("foo")
                               .instanceName("quux")
                               .build();
-        applicationRepo.createPutApplicationTransaction(fooId, 2).commit();
+        applicationRepo.createPutTransaction(fooId, 2).commit();
         assertFromParameter("3", "http://myhost:40555/application/v2/tenant/" + tenant + "/application/foo/environment/test/region/baz/instance/quux");
         localSessionRepo.addSession(new SessionHandlerTest.MockSession(5l, FilesApplicationPackage.fromFile(testApp)));
         ApplicationId bioId = new ApplicationId.Builder()
@@ -202,7 +202,7 @@ public class SessionCreateHandlerTest extends SessionHandlerTest {
                               .applicationName("foobio")
                               .instanceName("quux")
                               .build();
-        applicationRepo.createPutApplicationTransaction(bioId, 5).commit();
+        applicationRepo.createPutTransaction(bioId, 5).commit();
         assertFromParameter("6", "http://myhost:40555/application/v2/tenant/" + tenant + "/application/foobio/environment/staging/region/baz/instance/quux");
     }