Merge pull request #8655 from vespa-engine/jvenstad/fix-config-model-inconsitency

Create apps when prepare changes owner of sessions

1 files changed, 1 insertions, 0 deletions

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 af8956803ab..6a0a4a19737 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
@@ -64,6 +64,7 @@ public class LocalSession extends Session implements Comparable<LocalSession> {
                                        Optional<ApplicationSet> currentActiveApplicationSet, 
                                        Path tenantPath,
                                        Instant now) {
+        applicationRepo.createApplication(params.getApplicationId()); // TODO jvenstad: This is wrong, but it has to be done now, since preparation can change the application ID of a session :(
         Curator.CompletionWaiter waiter = zooKeeperClient.createPrepareWaiter();
         ConfigChangeActions actions = sessionPreparer.prepare(sessionContext, logger, params,
                                                               currentActiveApplicationSet, tenantPath, now);