diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-06-03 13:59:29 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-06-03 13:59:29 +0200 |
commit | 2bb93e3c2126d4d1a9c2cc6cd241fa77126c5ed8 (patch) | |
tree | 301c031c0ec8dec2e050a12b130b707dcce018ca /configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java | |
parent | 4b40bf440c8620654c75bc3e548157ef2609bffd (diff) |
Move more methods up to Session class
Diffstat (limited to 'configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java index d0082d34114..c1179a2dd17 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java @@ -4,7 +4,6 @@ package com.yahoo.vespa.config.server.session; import com.yahoo.config.application.api.ApplicationMetaData; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.provision.AllocatedHosts; -import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.TenantName; import com.yahoo.lang.SettableOptional; import com.yahoo.transaction.Transaction; @@ -12,7 +11,6 @@ import com.yahoo.vespa.config.server.GlobalComponentRegistry; import com.yahoo.vespa.config.server.ReloadHandler; import com.yahoo.vespa.config.server.application.ApplicationSet; import com.yahoo.vespa.config.server.modelfactory.ActivatedModelsBuilder; -import com.yahoo.vespa.config.server.tenant.TenantRepository; import com.yahoo.vespa.curator.Curator; import org.apache.zookeeper.KeeperException; @@ -75,10 +73,6 @@ public class RemoteSession extends Session { return applicationSet == null ? applicationSet = loadApplication() : applicationSet; } - public Session.Status getStatus() { - return zooKeeperClient.readStatus(); - } - public synchronized void deactivate() { applicationSet = null; } @@ -98,15 +92,6 @@ public class RemoteSession extends Session { log.log(Level.INFO, logPre() + "Session activated: " + getSessionId()); } - @Override - public String logPre() { - if (getApplicationId().equals(ApplicationId.defaultId())) { - return TenantRepository.logPre(getTenant()); - } else { - return TenantRepository.logPre(getApplicationId()); - } - } - void confirmUpload() { Curator.CompletionWaiter waiter = zooKeeperClient.getUploadWaiter(); log.log(Level.FINE, "Notifying upload waiter for session " + getSessionId()); @@ -136,10 +121,6 @@ public class RemoteSession extends Session { transaction.close(); } - public AllocatedHosts getAllocatedHosts() { - return zooKeeperClient.getAllocatedHosts(); - } - public ApplicationMetaData getMetaData() { return zooKeeperClient.loadApplicationPackage().getMetaData(); } |