1 files changed, 15 insertions, 70 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactory.java
index 337e9b3e99c..fc4071916ed 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactory.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactory.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.session;
 
-import com.yahoo.config.FileReference;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.model.application.provider.DeployData;
@@ -15,18 +14,15 @@ import com.yahoo.vespa.config.server.GlobalComponentRegistry;
 import com.yahoo.vespa.config.server.TimeoutBudget;
 import com.yahoo.vespa.config.server.application.TenantApplications;
 import com.yahoo.vespa.config.server.deploy.TenantFileSystemDirs;
-import com.yahoo.vespa.config.server.filedistribution.FileDirectory;
 import com.yahoo.vespa.config.server.host.HostValidator;
 import com.yahoo.vespa.config.server.tenant.TenantRepository;
 import com.yahoo.vespa.config.server.zookeeper.ConfigCurator;
 import com.yahoo.vespa.config.server.zookeeper.SessionCounter;
 import com.yahoo.vespa.curator.Curator;
-import com.yahoo.vespa.defaults.Defaults;
 import com.yahoo.vespa.flags.BooleanFlag;
 import com.yahoo.vespa.flags.Flags;
 
 import java.io.File;
-import java.io.IOException;
 import java.time.Clock;
 import java.util.List;
 import java.util.Optional;
@@ -35,7 +31,7 @@ import java.util.logging.Logger;
 
 /**
  * Serves as the factory of sessions. Takes care of copying files to the correct folder and initializing the
- * session state. There is one SessionFactory per tenant.
+ * session state.
  *
  * @author Ulf Lilleengen
  */
@@ -90,7 +86,8 @@ public class SessionFactory {
     }
 
     public RemoteSession createRemoteSession(long sessionId) {
-        SessionZooKeeperClient sessionZKClient = createSessionZooKeeperClient(getSessionPath(sessionId));
+        Path sessionPath = sessionsPath.append(String.valueOf(sessionId));
+        SessionZooKeeperClient sessionZKClient = createSessionZooKeeperClient(sessionPath);
         return new RemoteSession(tenant, sessionId, componentRegistry, sessionZKClient);
     }
 
@@ -118,10 +115,10 @@ public class SessionFactory {
 
     private LocalSession createSessionFromApplication(ApplicationPackage applicationPackage,
                                                       long sessionId,
+                                                      SessionZooKeeperClient sessionZKClient,
                                                       TimeoutBudget timeoutBudget,
                                                       Clock clock) {
         log.log(Level.FINE, TenantRepository.logPre(tenant) + "Creating session " + sessionId + " in ZooKeeper");
-        SessionZooKeeperClient sessionZKClient = createSessionZooKeeperClient(getSessionPath(sessionId));
         sessionZKClient.createNewSession(clock.instant());
         Curator.CompletionWaiter waiter = sessionZKClient.getUploadWaiter();
         LocalSession session = new LocalSession(tenant, sessionId, sessionPreparer, applicationPackage, sessionZKClient,
@@ -164,47 +161,23 @@ public class SessionFactory {
                                 boolean internalRedeploy, TimeoutBudget timeoutBudget) {
         long sessionId = getNextSessionId();
         try {
-            ApplicationPackage app = createApplicationPackage(applicationFile, applicationId,
-                                                              sessionId, currentlyActiveSessionId, internalRedeploy);
-            return createSessionFromApplication(app, sessionId, timeoutBudget, clock);
-        } catch (Exception e) {
-            throw new RuntimeException("Error creating session " + sessionId, e);
-        }
-    }
-
-    /**
-     * This method is used when creating a session based on a remote session and the distributed application package
-     * It does not wait for session being created on other servers
-     */
-    private LocalSession createLocalSession(File applicationFile, ApplicationId applicationId,
-                                            long sessionId, long currentlyActiveSessionId) {
-        try {
-            ApplicationPackage applicationPackage = createApplicationPackage(applicationFile, applicationId,
-                                                                             sessionId, currentlyActiveSessionId, false);
+            ensureSessionPathDoesNotExist(sessionId);
             SessionZooKeeperClient sessionZooKeeperClient = createSessionZooKeeperClient(getSessionPath(sessionId));
-            return new LocalSession(tenant, sessionId, sessionPreparer, applicationPackage, sessionZooKeeperClient,
-                                    getSessionAppDir(sessionId), applicationRepo, hostRegistry);
+            File userApplicationDir = getSessionAppDir(sessionId);
+            IOUtils.copyDirectory(applicationFile, userApplicationDir);
+            ApplicationPackage applicationPackage = createApplication(applicationFile,
+                                                                      userApplicationDir,
+                                                                      applicationId,
+                                                                      sessionId,
+                                                                      currentlyActiveSessionId,
+                                                                      internalRedeploy);
+            applicationPackage.writeMetaData();
+            return createSessionFromApplication(applicationPackage, sessionId, sessionZooKeeperClient, timeoutBudget, clock);
         } catch (Exception e) {
             throw new RuntimeException("Error creating session " + sessionId, e);
         }
     }
 
-    private ApplicationPackage createApplicationPackage(File applicationFile, ApplicationId applicationId,
-                                                        long sessionId, long currentlyActiveSessionId,
-                                                        boolean internalRedeploy) throws IOException {
-        ensureSessionPathDoesNotExist(sessionId);
-        File userApplicationDir = getSessionAppDir(sessionId);
-        IOUtils.copyDirectory(applicationFile, userApplicationDir);
-        ApplicationPackage applicationPackage = createApplication(applicationFile,
-                                                                  userApplicationDir,
-                                                                  applicationId,
-                                                                  sessionId,
-                                                                  currentlyActiveSessionId,
-                                                                  internalRedeploy);
-        applicationPackage.writeMetaData();
-        return applicationPackage;
-    }
-
     /**
      * Returns a new session instance for the given session id.
      */
@@ -217,34 +190,6 @@ public class SessionFactory {
                                 getSessionAppDir(sessionId), applicationRepo, hostRegistry);
     }
 
-    /**
-     * Returns a new session instance for the given session id.
-     */
-    LocalSession createLocalSessionUsingDistributedApplicationPackage(long sessionId) {
-        if (applicationRepo.hasLocalSession(sessionId)) {
-            log.log(Level.FINE, "Local session for session id " + sessionId + " already exists");
-            return createSessionFromId(sessionId);
-        }
-
-        log.log(Level.INFO, "Creating local session for session id " + sessionId);
-        SessionZooKeeperClient sessionZKClient = createSessionZooKeeperClient(getSessionPath(sessionId));
-        FileReference fileReference = sessionZKClient.readApplicationPackageReference();
-        log.log(Level.FINE, "File reference for session id " + sessionId + ": " + fileReference);
-        if (fileReference != null) {
-            File rootDir = new File(Defaults.getDefaults().underVespaHome(componentRegistry.getConfigserverConfig().fileReferencesDir()));
-            File sessionDir = new FileDirectory(rootDir).getFile(fileReference);
-            if (!sessionDir.exists())
-                throw new RuntimeException("File reference for session " + sessionId + " not found (" + sessionDir.getAbsolutePath() + ")");
-            ApplicationId applicationId = sessionZKClient.readApplicationId();
-            return createLocalSession(sessionDir,
-                                      applicationId,
-                                      sessionId,
-                                      applicationRepo.activeSessionOf(applicationId).orElse(nonExistingActiveSession));
-        }
-        return null;
-    }
-
-    // Return Optional instead of faking it with nonExistingActiveSession
     private long getActiveSessionId(ApplicationId applicationId) {
         List<ApplicationId> applicationIds = applicationRepo.activeApplications();
         if (applicationIds.contains(applicationId)) {