summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-06-09 08:46:27 +0200
committerHarald Musum <musum@verizonmedia.com>2020-06-09 08:46:27 +0200
commitb0a9737aa770b37927ff22892673824a02297af2 (patch)
tree4ecb8a26e31d660d3798a5a2b2cfb7985365d4b2 /configserver
parentb6e282a885af9fe579204993fa35114d03655eb9 (diff)
Do not check zookeeper session path
It will always exisst when creating a local session based on a remote session
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactory.java2
1 files changed, 1 insertions, 1 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..8aba9fa465d 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
@@ -164,6 +164,7 @@ public class SessionFactory {
boolean internalRedeploy, TimeoutBudget timeoutBudget) {
long sessionId = getNextSessionId();
try {
+ ensureSessionPathDoesNotExist(sessionId);
ApplicationPackage app = createApplicationPackage(applicationFile, applicationId,
sessionId, currentlyActiveSessionId, internalRedeploy);
return createSessionFromApplication(app, sessionId, timeoutBudget, clock);
@@ -192,7 +193,6 @@ public class SessionFactory {
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,