Merge pull request #9216 from vespa-engine/revert-9208-jvenstad/config-fix

Revert "Jvenstad/config fix"

18 files changed, 84 insertions, 153 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 f2e1410e9a9..bea087f6ae9 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
@@ -302,35 +302,34 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
         if (tenant == null) return false;
 
         TenantApplications tenantApplications = tenant.getApplicationRepo();
-        try (Lock lock = tenantApplications.lock(applicationId)) {
-            if ( ! tenantApplications.exists(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.requireActiveSessionOf(applicationId);
-            RemoteSession remoteSession = getRemoteSession(tenant, sessionId);
-            remoteSession.createDeleteTransaction().commit();
-
-            log.log(LogLevel.INFO, TenantRepository.logPre(applicationId) + "Waiting for session " + sessionId + " to be deleted");
-            // TODO: Add support for timeout in request
-            Duration waitTime = Duration.ofSeconds(60);
-            if (localSessionHasBeenDeleted(applicationId, sessionId, waitTime)) {
-                log.log(LogLevel.INFO, TenantRepository.logPre(applicationId) + "Session " + sessionId + " deleted");
-            } else {
-                log.log(LogLevel.ERROR, TenantRepository.logPre(applicationId) + "Session " + sessionId + " was not deleted (waited " + waitTime + ")");
-                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.requireActiveSessionOf(applicationId);
+        RemoteSession remoteSession = getRemoteSession(tenant, sessionId);
+        remoteSession.createDeleteTransaction().commit();
+
+        log.log(LogLevel.INFO, TenantRepository.logPre(applicationId) + "Waiting for session " + sessionId + " to be deleted");
+        // TODO: Add support for timeout in request
+        Duration waitTime = Duration.ofSeconds(60);
+        if (localSessionHasBeenDeleted(applicationId, sessionId, waitTime)) {
+            log.log(LogLevel.INFO, TenantRepository.logPre(applicationId) + "Session " + sessionId + " deleted");
+        } else {
+            log.log(LogLevel.ERROR, TenantRepository.logPre(applicationId) + "Session " + sessionId + " was not deleted (waited " + waitTime + ")");
+            return false;
+        }
 
-            NestedTransaction transaction = new NestedTransaction();
-            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.createDeleteTransaction(applicationId));
+        NestedTransaction transaction = new NestedTransaction();
+        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.createDeleteTransaction(applicationId));
 
-            hostProvisioner.ifPresent(provisioner -> provisioner.remove(transaction, applicationId));
-            transaction.onCommitted(() -> log.log(LogLevel.INFO, "Deleted " + applicationId));
-            transaction.commit();
-        }
+        hostProvisioner.ifPresent(provisioner -> provisioner.remove(transaction, applicationId));
+        transaction.onCommitted(() -> log.log(LogLevel.INFO, "Deleted " + applicationId));
+        transaction.commit();
 
         return true;
     }
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 410ff4e833c..348e8f1cafc 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
@@ -11,13 +11,11 @@ import com.yahoo.transaction.Transaction;
 import com.yahoo.vespa.config.server.ReloadHandler;
 import com.yahoo.vespa.config.server.tenant.TenantRepository;
 import com.yahoo.vespa.curator.Curator;
-import com.yahoo.vespa.curator.Lock;
 import com.yahoo.vespa.curator.transaction.CuratorOperations;
 import com.yahoo.vespa.curator.transaction.CuratorTransaction;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
 
-import java.time.Duration;
 import java.util.List;
 import java.util.OptionalLong;
 import java.util.Set;
@@ -48,21 +46,20 @@ public class TenantApplications {
     private final Curator.DirectoryCache directoryCache;
     private final ReloadHandler reloadHandler;
     private final TenantName tenant;
-    private final Lock lock;
 
-    private TenantApplications(Curator curator, ReloadHandler reloadHandler, TenantName tenant, Lock lock) {
+    private TenantApplications(Curator curator, Path applicationsPath, ReloadHandler reloadHandler, TenantName tenant) {
         this.curator = curator;
-        this.applicationsPath = TenantRepository.getApplicationsPath(tenant);
+        this.applicationsPath = applicationsPath;
+        curator.create(applicationsPath);
         this.reloadHandler = reloadHandler;
         this.tenant = tenant;
-        this.lock = lock;
         this.directoryCache = curator.createDirectoryCache(applicationsPath.getAbsolute(), false, false, pathChildrenExecutor);
         this.directoryCache.start();
         this.directoryCache.addListener(this::childEvent);
     }
 
-    public static TenantApplications create(Curator curator, ReloadHandler reloadHandler, TenantName tenant, Lock lock) {
-        return new TenantApplications(curator, reloadHandler, tenant, lock);
+    public static TenantApplications create(Curator curator, ReloadHandler reloadHandler, TenantName tenant) {
+        return new TenantApplications(curator, TenantRepository.getApplicationsPath(tenant), reloadHandler, tenant);
     }
 
     /**
@@ -89,17 +86,13 @@ public class TenantApplications {
             try {
                 curator.delete(applicationsPath.append(appNode));
             }
-            catch (RuntimeException e) {
+            catch (Exception e) {
                 log.log(LogLevel.WARNING, TenantRepository.logPre(tenant) + "Failed to clean up stray node '" + appNode + "'!", e);
             }
             return false;
         }
     }
 
-    public boolean exists(ApplicationId id) {
-        return curator.exists(applicationPath(id));
-    }
-
     /** 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)
@@ -121,9 +114,7 @@ public class TenantApplications {
      * Creates a node for the given application, marking its existence.
      */
     public void createApplication(ApplicationId id) {
-        try (Lock lock = lock(id)) {
-            curator.create(applicationPath(id));
-        }
+        curator.create(applicationPath(id));
     }
 
     /**
@@ -142,7 +133,7 @@ public class TenantApplications {
      * Returns a transaction which deletes this application.
      */
     public CuratorTransaction createDeleteTransaction(ApplicationId applicationId) {
-        return CuratorTransaction.from(CuratorOperations.deleteAll(applicationPath(applicationId).getAbsolute(), curator), curator);
+        return CuratorTransaction.from(CuratorOperations.delete(applicationPath(applicationId).getAbsolute()), curator);
     }
 
     /**
@@ -159,17 +150,6 @@ public class TenantApplications {
         directoryCache.close();
     }
 
-    /** Returns the lock for changing the session status of the application's tenant. */
-    public Lock lock() {
-        lock.acquire(Duration.ofMinutes(1)); // These locks shouldn't be held for very long.
-        return lock;
-    }
-
-    /** Returns the lock for changing the session status of the given application. */
-    public Lock lock(ApplicationId id) {
-        return lock();
-    }
-
     private void childEvent(CuratorFramework client, PathChildrenCacheEvent event) {
         switch (event.getType()) {
             case CHILD_ADDED:
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
index b6e1d1873c9..01bb4e2dc76 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java
@@ -119,9 +119,9 @@ public class Deployment implements com.yahoo.config.provision.Deployment {
             prepare();
 
         TimeoutBudget timeoutBudget = new TimeoutBudget(clock, timeout);
-
-        try (Lock lock = tenant.getApplicationRepo().lock(session.getApplicationId())) {
-            validateSessionStatus(session);
+        long sessionId = session.getSessionId();
+        validateSessionStatus(session);
+        try (Lock lock = tenant.getSessionLock(timeout)) {
             NestedTransaction transaction = new NestedTransaction();
             transaction.add(deactivateCurrentActivateNew(applicationRepository.getActiveSession(session.getApplicationId()), session, ignoreSessionStaleFailure));
 
@@ -129,15 +129,13 @@ public class Deployment implements com.yahoo.config.provision.Deployment {
                 hostProvisioner.get().activate(transaction, session.getApplicationId(), session.getAllocatedHosts().getHosts());
             }
             transaction.commit();
+            session.waitUntilActivated(timeoutBudget);
         } catch (RuntimeException e) {
             throw e;
         } catch (Exception e) {
             throw new InternalServerException("Error activating application", e);
         }
-
-        session.waitUntilActivated(timeoutBudget);
-
-        log.log(LogLevel.INFO, session.logPre() + "Session " + session.getSessionId() +
+        log.log(LogLevel.INFO, session.logPre() + "Session " + sessionId + 
                                " activated successfully using " +
                                ( hostProvisioner.isPresent() ? hostProvisioner.get() : "no host provisioner" ) +
                                ". Config generation " + session.getMetaData().getGeneration());
@@ -155,7 +153,7 @@ public class Deployment implements com.yahoo.config.provision.Deployment {
 
     /** Exposes the session of this for testing only */
     public LocalSession session() { return session; }
-
+    
     private long validateSessionStatus(LocalSession localSession) {
         long sessionId = localSession.getSessionId();
         if (Session.Status.NEW.equals(localSession.getStatus())) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
index 26f437920ad..8838daeb32e 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
@@ -70,7 +70,10 @@ public class RemoteSession extends Session {
     }
 
     public synchronized ApplicationSet ensureApplicationLoaded() {
-        return applicationSet == null ? applicationSet = loadApplication() : applicationSet;
+        if (applicationSet == null) {
+            applicationSet = loadApplication();
+        }
+        return applicationSet;
     }
 
     public Session.Status getStatus() {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenant.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenant.java
index 3590859e4f7..a68f4a396cd 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenant.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenant.java
@@ -38,6 +38,7 @@ public class Tenant implements TenantHandlerProvider {
     private final SessionFactory sessionFactory;
     private final LocalSessionRepo localSessionRepo;
     private final TenantApplications applicationRepo;
+    private final Lock sessionLock;
     private final RequestHandler requestHandler;
     private final ReloadHandler reloadHandler;
     private final TenantFileSystemDirs tenantFileSystemDirs;
@@ -60,6 +61,7 @@ public class Tenant implements TenantHandlerProvider {
         this.remoteSessionRepo = remoteSessionRepo;
         this.sessionFactory = sessionFactory;
         this.localSessionRepo = localSessionRepo;
+        this.sessionLock = createLock(curator, path);
         this.applicationRepo = applicationRepo;
         this.tenantFileSystemDirs = tenantFileSystemDirs;
         this.curator = curator;
@@ -108,6 +110,14 @@ public class Tenant implements TenantHandlerProvider {
         return localSessionRepo;
     }
 
+    /**
+     * This lock allows activation and deactivation of sessions under this tenant.
+     */
+    public Lock getSessionLock(Duration timeout) {
+        sessionLock.acquire(timeout);
+        return sessionLock;
+    }
+    
     @Override
     public String toString() {
         return getName().value();
@@ -155,4 +165,10 @@ public class Tenant implements TenantHandlerProvider {
         curator.delete(path);
     }
 
+    private static Lock createLock(Curator curator, Path tenantPath) {
+        Path lockPath = tenantPath.append(SESSION_LOCK_PATH);
+        curator.create(lockPath);
+        return new Lock(lockPath.getAbsolute(), curator);
+    }
+
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantBuilder.java
index 434da822a91..943ae6248fc 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantBuilder.java
@@ -13,13 +13,9 @@ import com.yahoo.vespa.config.server.application.TenantApplications;
 import com.yahoo.vespa.config.server.deploy.TenantFileSystemDirs;
 import com.yahoo.vespa.config.server.monitoring.Metrics;
 import com.yahoo.vespa.config.server.session.*;
-import com.yahoo.vespa.curator.Curator;
-import com.yahoo.vespa.curator.Lock;
 
 import java.util.Collections;
 
-import static com.yahoo.vespa.config.server.tenant.Tenant.SESSION_LOCK_PATH;
-
 /**
  * Builder for helping out with tenant creation. Each of a tenants dependencies may be overridden for testing.
  *
@@ -135,7 +131,6 @@ public class TenantBuilder {
                                                                  Collections.singletonList(componentRegistry.getReloadListener()),
                                                                  ConfigResponseFactory.create(componentRegistry.getConfigserverConfig()),
                                                                  componentRegistry.getHostRegistries(),
-                                                                 createLock(componentRegistry.getCurator(), tenant),
                                                                  componentRegistry.getCurator());
             if (hostValidator == null) {
                 this.hostValidator = impl;
@@ -170,11 +165,5 @@ public class TenantBuilder {
         }
     }
 
-    public static Lock createLock(Curator curator, TenantName tenant) {
-        Path lockPath = TenantRepository.getTenantPath(tenant).append(SESSION_LOCK_PATH);
-        curator.create(lockPath);
-        return new Lock(lockPath.getAbsolute(), curator);
-    }
-
     public TenantName getTenantName() { return tenant; }
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java
index df3f4129997..fe34e6c361d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java
@@ -6,7 +6,6 @@ import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Optional;
-import java.util.OptionalLong;
 import java.util.Set;
 
 import com.yahoo.component.Version;
@@ -32,7 +31,6 @@ import com.yahoo.config.provision.TenantName;
 import com.yahoo.vespa.config.server.monitoring.MetricUpdater;
 import com.yahoo.vespa.config.server.monitoring.Metrics;
 import com.yahoo.vespa.curator.Curator;
-import com.yahoo.vespa.curator.Lock;
 
 /**
  * A per tenant request handler, for handling reload (activate application) and getConfig requests for
@@ -59,7 +57,6 @@ public class TenantRequestHandler implements RequestHandler, ReloadHandler, Host
                                 List<ReloadListener> reloadListeners,
                                 ConfigResponseFactory responseFactory,
                                 HostRegistries hostRegistries,
-                                Lock lock,
                                 Curator curator) { // TODO jvenstad: Merge this class with TenantApplications, and straighten this out.
         this.metrics = metrics;
         this.tenant = tenant;
@@ -67,7 +64,7 @@ public class TenantRequestHandler implements RequestHandler, ReloadHandler, Host
         this.responseFactory = responseFactory;
         this.tenantMetricUpdater = metrics.getOrCreateMetricUpdater(Metrics.createDimensions(tenant));
         this.hostRegistry = hostRegistries.createApplicationHostRegistry(tenant);
-        this.applications = TenantApplications.create(curator, this, tenant, lock);
+        this.applications = TenantApplications.create(curator, this, tenant);
     }
 
     /**
@@ -102,31 +99,18 @@ public class TenantRequestHandler implements RequestHandler, ReloadHandler, Host
      */
     @Override
     public void reloadConfig(ApplicationSet applicationSet) {
-        ApplicationId id = applicationSet.getId();
-        try (Lock lock = applications.lock(id)) {
-            if ( ! applications.exists(id))
-                return; // Application was deleted before activation.
-            if (applicationSet.getApplicationGeneration() != applications.requireActiveSessionOf(id))
-                return; // Application activated a new session before we got here.
-
-            setLiveApp(applicationSet);
-            notifyReloadListeners(applicationSet);
-        }
+        setLiveApp(applicationSet);
+        notifyReloadListeners(applicationSet);
     }
 
     @Override
     public void removeApplication(ApplicationId applicationId) {
-        try (Lock lock = applications.lock(applicationId)) {
-            if (applications.exists(applicationId))
-                return; // Application was deployed again.
-
-            if (applicationMapper.hasApplication(applicationId, clock.instant())) {
-                applicationMapper.remove(applicationId);
-                hostRegistry.removeHostsForKey(applicationId);
-                reloadListenersOnRemove(applicationId);
-                tenantMetricUpdater.setApplications(applicationMapper.numApplications());
-                metrics.removeMetricUpdater(Metrics.createDimensions(applicationId));
-            }
+        if (applicationMapper.hasApplication(applicationId, clock.instant())) {
+            applicationMapper.remove(applicationId);
+            hostRegistry.removeHostsForKey(applicationId);
+            reloadListenersOnRemove(applicationId);
+            tenantMetricUpdater.setApplications(applicationMapper.numApplications());
+            metrics.removeMetricUpdater(Metrics.createDimensions(applicationId));
         }
     }
 
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 14ef8b16d44..69c88dc0275 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
@@ -6,7 +6,6 @@ import com.yahoo.config.provision.TenantName;
 import com.yahoo.text.Utf8;
 import com.yahoo.vespa.config.server.MockReloadHandler;
 
-import com.yahoo.vespa.config.server.tenant.TenantBuilder;
 import com.yahoo.vespa.config.server.tenant.TenantRepository;
 import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.curator.mock.MockCurator;
@@ -126,7 +125,7 @@ public class TenantApplicationsTest {
     }
 
     private TenantApplications createZKAppRepo(MockReloadHandler reloadHandler) {
-        return TenantApplications.create(curator, reloadHandler, tenantName, TenantBuilder.createLock(curator, tenantName));
+        return TenantApplications.create(curator, reloadHandler, tenantName);
     }
 
     private static ApplicationId createApplicationId(String name) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
index 94541fd0946..858d1e0eaa7 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandlerTest.java
@@ -105,7 +105,7 @@ public class SessionActiveHandlerTest extends SessionHandlerTest {
                 .modelFactoryRegistry(new ModelFactoryRegistry(Collections.singletonList(modelFactory)))
                 .build();
         tenantRepository = new TenantRepository(componentRegistry, false);
-        applicationRepo = TenantApplications.create(curator, new MockReloadHandler(), tenantName, TenantBuilder.createLock(curator, tenantName));
+        applicationRepo = TenantApplications.create(curator, new MockReloadHandler(), tenantName);
         localRepo = new LocalSessionRepo(clock, curator);
         pathPrefix = "/application/v2/tenant/" + tenantName + "/session/";
         hostProvisioner = new MockProvisioner();
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 30a538872e3..0946ef3992c 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
@@ -72,7 +72,7 @@ public class SessionCreateHandlerTest extends SessionHandlerTest {
     @Before
     public void setupRepo() {
         Curator curator = new MockCurator();
-        applicationRepo = TenantApplications.create(curator, new MockReloadHandler(), tenant, TenantBuilder.createLock(curator, tenant));
+        applicationRepo = TenantApplications.create(curator, new MockReloadHandler(), tenant);
         localSessionRepo = new LocalSessionRepo(Clock.systemUTC(), curator);
         tenantRepository = new TenantRepository(componentRegistry, false);
         sessionFactory = new MockSessionFactory();
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
index edfdfcf9912..11c0cf057cc 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
@@ -87,7 +87,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
                 .withSessionFactory(new MockSessionFactory())
                 .withLocalSessionRepo(localRepo)
                 .withRemoteSessionRepo(remoteSessionRepo)
-                .withApplicationRepo(TenantApplications.create(curator, new MockReloadHandler(), tenant, TenantBuilder.createLock(curator, tenant)));
+                .withApplicationRepo(TenantApplications.create(curator, new MockReloadHandler(), tenant));
         tenantRepository.addTenant(tenantBuilder);
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionRepoTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionRepoTest.java
index 8a946b7e23e..3626c6269cc 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionRepoTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionRepoTest.java
@@ -13,8 +13,6 @@ import com.yahoo.io.IOUtils;
 import com.yahoo.vespa.config.server.host.HostRegistry;
 import com.yahoo.vespa.config.server.http.SessionHandlerTest;
 
-import com.yahoo.vespa.config.server.tenant.TenantBuilder;
-import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.curator.mock.MockCurator;
 import org.junit.Before;
 import org.junit.Rule;
@@ -56,9 +54,8 @@ public class LocalSessionRepoTest {
             IOUtils.copyDirectory(testApp, new File(tenantFileSystemDirs.sessionsPath(), "3"));
         }
         clock = new ManualClock(Instant.ofEpochSecond(1));
-        Curator curator = new MockCurator();
         LocalSessionLoader loader = new SessionFactoryImpl(globalComponentRegistry,
-                                                           TenantApplications.create(curator, new MockReloadHandler(), tenantName, TenantBuilder.createLock(curator, tenantName)),
+                                                           TenantApplications.create(new MockCurator(), new MockReloadHandler(), tenantName),
                                                            tenantFileSystemDirs, new HostRegistry<>(),
                                                            tenantName);
         repo = new LocalSessionRepo(tenantFileSystemDirs, loader, clock, 5, globalComponentRegistry.getCurator());
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java
index 36b815ddac3..a4432dcbfcd 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/LocalSessionTest.java
@@ -22,7 +22,6 @@ import com.yahoo.vespa.config.server.deploy.DeployHandlerLogger;
 import com.yahoo.vespa.config.server.deploy.TenantFileSystemDirs;
 import com.yahoo.vespa.config.server.deploy.ZooKeeperClient;
 import com.yahoo.vespa.config.server.host.HostRegistry;
-import com.yahoo.vespa.config.server.tenant.TenantBuilder;
 import com.yahoo.vespa.config.server.tenant.TenantRepository;
 import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.curator.mock.MockCurator;
@@ -197,7 +196,7 @@ public class LocalSessionTest {
         zkClient.write(Collections.singletonMap(new Version(0, 0, 0), new MockFileRegistry()));
         File sessionDir = new File(tenantFileSystemDirs.sessionsPath(), String.valueOf(sessionId));
         sessionDir.createNewFile();
-        TenantApplications applications = TenantApplications.create(curator, new MockReloadHandler(), tenant, TenantBuilder.createLock(curator, tenant));
+        TenantApplications applications = TenantApplications.create(curator, new MockReloadHandler(), tenant);
         applications.createApplication(zkc.readApplicationId());
         return new LocalSession(tenant, sessionId, preparer,
                 new SessionContext(
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionRepoTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionRepoTest.java
index a04ae513268..9dda653dbc1 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionRepoTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/RemoteSessionRepoTest.java
@@ -100,7 +100,7 @@ public class RemoteSessionRepoTest {
     public void testBadApplicationRepoOnActivate() {
         long sessionId = 3L;
         TenantName mytenant = TenantName.from("mytenant");
-        TenantApplications applicationRepo = TenantApplications.create(curator, new MockReloadHandler(), mytenant, TenantBuilder.createLock(curator, mytenant));
+        TenantApplications applicationRepo = TenantApplications.create(curator, new MockReloadHandler(), mytenant);
         curator.set(TenantRepository.getApplicationsPath(mytenant).append("mytenant:appX:default"), new byte[0]); // Invalid data
         Tenant tenant = TenantBuilder.create(new TestComponentRegistry.Builder().curator(curator).build(), mytenant)
                 .withApplicationRepo(applicationRepo)
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
index 7d801f93f3a..9ad90e84d86 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
@@ -28,7 +28,6 @@ import com.yahoo.vespa.config.server.model.TestModelFactory;
 import com.yahoo.vespa.config.server.modelfactory.ModelFactoryRegistry;
 import com.yahoo.vespa.config.server.provision.HostProvisionerProvider;
 import com.yahoo.vespa.config.server.tenant.Rotations;
-import com.yahoo.vespa.config.server.tenant.TenantBuilder;
 import com.yahoo.vespa.config.server.zookeeper.ConfigCurator;
 
 import com.yahoo.vespa.curator.mock.MockCurator;
@@ -218,7 +217,7 @@ public class SessionPreparerTest {
         return new SessionContext(app,
                                   new SessionZooKeeperClient(curator, sessionsPath),
                                   app.getAppDir(),
-                                  TenantApplications.create(curator, new MockReloadHandler(), TenantName.from("tenant"), TenantBuilder.createLock(curator, TenantName.from("tenant"))),
+                                  TenantApplications.create(curator, new MockReloadHandler(), TenantName.from("tenant")),
                                   new HostRegistry<>(),
                                   new SuperModelGenerationCounter(curator),
                                   flagSource);
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
index 9bd5c5f1614..4046384005d 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRepositoryTest.java
@@ -81,8 +81,6 @@ public class TenantRepositoryTest {
 
     @Test
     public void testListenersAdded() throws IOException, SAXException {
-        tenantRepository.getTenant(tenant1).getApplicationRepo().createApplication(ApplicationId.defaultId());
-        tenantRepository.getTenant(tenant1).getApplicationRepo().createPutTransaction(ApplicationId.defaultId(), 4).commit();
         tenantRepository.getTenant(tenant1).getReloadHandler().reloadConfig(ApplicationSet.fromSingle(
                 new Application(new VespaModel(MockApplicationPackage.createEmpty()),
                                 new ServerCache(),
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java
index 157713b0508..952f87cbc6d 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandlerTest.java
@@ -93,8 +93,7 @@ public class TenantRequestHandlerTest {
         Metrics sh = Metrics.createTestMetrics();
         List<ReloadListener> listeners = new ArrayList<>();
         listeners.add(listener);
-        server = new TenantRequestHandler(sh, tenant, listeners, new UncompressedConfigResponseFactory(),
-                                          new HostRegistries(), TenantBuilder.createLock(curator, tenant), curator);
+        server = new TenantRequestHandler(sh, tenant, listeners, new UncompressedConfigResponseFactory(), new HostRegistries(), curator);
         componentRegistry = new TestComponentRegistry.Builder()
                 .curator(curator)
                 .modelFactoryRegistry(createRegistry())
@@ -177,8 +176,6 @@ public class TenantRequestHandlerTest {
     public void testReloadConfig() throws IOException {
         ApplicationId applicationId = new ApplicationId.Builder().applicationName(ApplicationName.defaultName()).tenant(tenant).build();
 
-        server.applications().createApplication(applicationId);
-        server.applications().createPutTransaction(applicationId, 1).commit();
         server.reloadConfig(reloadConfig(1));
         assertThat(listener.reloaded.get(), is(1));
         // Using only payload list for this simple test
@@ -198,7 +195,6 @@ public class TenantRequestHandlerTest {
 
         listener.reloaded.set(0);
         feedApp(app2, 2, defaultApp(), true);
-        server.applications().createPutTransaction(applicationId, 2).commit();
         server.reloadConfig(reloadConfig(2L));
         configResponse = getConfigResponse(SimpletypesConfig.class, server, defaultApp(), vespaVersion, "");
         assertTrue(configResponse.isInternalRedeploy());
@@ -210,34 +206,19 @@ public class TenantRequestHandlerTest {
 
     @Test
     public void testRemoveApplication() {
-        ApplicationId appId = ApplicationId.from(tenant.value(), "default", "default");
         server.reloadConfig(reloadConfig(1));
-        assertThat(listener.reloaded.get(), is(0));
-
-        server.applications().createApplication(appId);
-        server.applications().createPutTransaction(appId, 1).commit();
-        server.reloadConfig(reloadConfig(1));
-        assertThat(listener.reloaded.get(), is(1));
-
-        assertThat(listener.removed.get(), is(0));
-
-        server.removeApplication(appId);
         assertThat(listener.removed.get(), is(0));
-
-        server.applications().createDeleteTransaction(appId).commit();
-        server.removeApplication(appId);
+        server.removeApplication(new ApplicationId.Builder().applicationName(ApplicationName.defaultName()).tenant(tenant).build());
         assertThat(listener.removed.get(), is(1));
     }
 
     @Test
     public void testResolveForAppId() {
         long id = 1L;
+        SessionZooKeeperClient zkc = new SessionZooKeeperClient(curator, TenantRepository.getSessionsPath(tenant).append(String.valueOf(id)));
         ApplicationId appId = new ApplicationId.Builder()
                               .tenant(tenant)
                               .applicationName("myapp").instanceName("myinst").build();
-        server.applications().createApplication(appId);
-        server.applications().createPutTransaction(appId, 1).commit();
-        SessionZooKeeperClient zkc = new SessionZooKeeperClient(curator, TenantRepository.getSessionsPath(tenant).append(String.valueOf(id)));
         zkc.writeApplicationId(appId);
         RemoteSession session = new RemoteSession(appId.tenant(), id, componentRegistry, zkc);
         server.reloadConfig(session.ensureApplicationLoaded());
@@ -275,8 +256,6 @@ public class TenantRequestHandlerTest {
     }
 
     private void feedAndReloadApp(File appDir, long sessionId, ApplicationId appId) throws IOException {
-        server.applications().createApplication(appId);
-        server.applications().createPutTransaction(appId, sessionId).commit();
         feedApp(appDir, sessionId, appId, false);
         SessionZooKeeperClient zkc = new SessionZooKeeperClient(curator, TenantRepository.getSessionsPath(tenant).append(String.valueOf(sessionId)));
         zkc.writeApplicationId(appId);
@@ -312,11 +291,9 @@ public class TenantRequestHandlerTest {
     @Test
     public void testHasApplication() {
         assertdefaultAppNotFound();
-        ApplicationId appId = ApplicationId.from(tenant.value(), "default", "default");
-        server.applications().createApplication(appId);
-        server.applications().createPutTransaction(appId, 1).commit();
         server.reloadConfig(reloadConfig(1));
-        assertTrue(server.hasApplication(appId, Optional.of(vespaVersion)));
+        assertTrue(server.hasApplication(new ApplicationId.Builder().applicationName(ApplicationName.defaultName()).tenant(tenant).build(),
+                                         Optional.of(vespaVersion)));
     }
 
     private void assertdefaultAppNotFound() {
@@ -325,13 +302,10 @@ public class TenantRequestHandlerTest {
 
     @Test
     public void testMultipleApplicationsReload() {
-        ApplicationId appId = ApplicationId.from(tenant.value(), "foo", "default");
         assertdefaultAppNotFound();
-        server.applications().createApplication(appId);
-        server.applications().createPutTransaction(appId, 1).commit();
         server.reloadConfig(reloadConfig(1, "foo"));
         assertdefaultAppNotFound();
-        assertTrue(server.hasApplication(appId,
+        assertTrue(server.hasApplication(new ApplicationId.Builder().tenant(tenant).applicationName("foo").build(),
                                          Optional.of(vespaVersion)));
         assertThat(server.resolveApplicationId("doesnotexist"), is(ApplicationId.defaultId()));
         assertThat(server.resolveApplicationId("mytesthost"), is(new ApplicationId.Builder()
@@ -344,8 +318,6 @@ public class TenantRequestHandlerTest {
         assertdefaultAppNotFound();
 
         VespaModel model = new VespaModel(FilesApplicationPackage.fromFile(new File("src/test/apps/app")));
-        server.applications().createApplication(ApplicationId.defaultId());
-        server.applications().createPutTransaction(ApplicationId.defaultId(), 1).commit();
         server.reloadConfig(ApplicationSet.fromSingle(new Application(model,
                                                                       new ServerCache(),
                                                                       1,
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantTest.java
index 2b571c73041..baab250a508 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/TenantTest.java
@@ -6,7 +6,6 @@ import com.yahoo.config.provision.TenantName;
 import com.yahoo.vespa.config.server.MockReloadHandler;
 import com.yahoo.vespa.config.server.TestComponentRegistry;
 import com.yahoo.vespa.config.server.application.TenantApplications;
-import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.curator.mock.MockCurator;
 import org.junit.Before;
 import org.junit.Test;
@@ -38,9 +37,8 @@ public class TenantTest {
     private Tenant createTenant(String name) {
         TenantRepository tenantRepository = new TenantRepository(componentRegistry, false);
         TenantName tenantName = TenantName.from(name);
-        Curator curator = new MockCurator();
         TenantBuilder tenantBuilder = TenantBuilder.create(componentRegistry, tenantName)
-                .withApplicationRepo(TenantApplications.create(curator, new MockReloadHandler(), tenantName, TenantBuilder.createLock(curator, tenantName)));
+                .withApplicationRepo(TenantApplications.create(new MockCurator(), new MockReloadHandler(), tenantName));
         tenantRepository.addTenant(tenantBuilder);
         return tenantRepository.getTenant(tenantName);
     }