diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2019-03-01 20:08:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-01 20:08:54 +0100 |
| commit | d3aec6c543173fe36a6cbef8291417489d62e86b (patch) | |
| tree | 235dce7d99f2aacfb11ed1b1d9f7360c76206913 | |
| parent | f24d73415432e75b7a59f83cfc1483cdc52bc7f6 (diff) | |
| parent | 11491027a274738e0c9481a5bfe5ef601b1d6f20 (diff) | |
Merge pull request #8658 from vespa-engine/revert-8655-jvenstad/fix-config-model-inconsitency
Revert "Create apps when prepare changes owner of sessions"
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSession.java | 1 |
1 files changed, 0 insertions, 1 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 6a0a4a19737..af8956803ab 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,7 +64,6 @@ 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); |