aboutsummaryrefslogtreecommitdiffstats
path: root/configserver/src
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-10-13 15:47:44 +0200
committerHarald Musum <musum@verizonmedia.com>2020-10-13 15:47:44 +0200
commitc6547fcfd974cc49e55c2dfac7d79f7483fefc66 (patch)
tree4ee8329f0137f223497ad67e441453318173b62e /configserver/src
parent570146dd4da3ff5f493344fd67a7f670d207e1c0 (diff)
Use createLocalSession()
Diffstat (limited to 'configserver/src')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java12
1 files changed, 5 insertions, 7 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
index 497560386b1..e0e17b41d22 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
@@ -213,13 +213,12 @@ public class SessionRepository {
* 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) {
+ private void createLocalSession(File applicationFile, ApplicationId applicationId, long sessionId) {
try {
- Optional<Long> currentlyActiveSessionId = getActiveSessionId(applicationId);
+ Optional<Long> activeSessionId = getActiveSessionId(applicationId);
ApplicationPackage applicationPackage = createApplicationPackage(applicationFile, applicationId,
- sessionId, currentlyActiveSessionId, false);
- SessionZooKeeperClient sessionZooKeeperClient = createSessionZooKeeperClient(sessionId);
- return new LocalSession(tenantName, sessionId, applicationPackage, sessionZooKeeperClient);
+ sessionId, activeSessionId, false);
+ createLocalSession(sessionId, applicationPackage);
} catch (Exception e) {
throw new RuntimeException("Error creating session " + sessionId, e);
}
@@ -645,8 +644,7 @@ public class SessionRepository {
ApplicationId applicationId = sessionZKClient.readApplicationId()
.orElseThrow(() -> new RuntimeException("Could not find application id for session " + sessionId));
log.log(Level.FINE, () -> "Creating local session for tenant '" + tenantName + "' with session id " + sessionId);
- LocalSession localSession = createLocalSession(sessionDir, applicationId, sessionId);
- addLocalSession(localSession);
+ createLocalSession(sessionDir, applicationId, sessionId);
}
}