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 | |
parent | 4b40bf440c8620654c75bc3e548157ef2609bffd (diff) |
Move more methods up to Session class
Diffstat (limited to 'configserver')
3 files changed, 16 insertions, 50 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 831f4ba3679..56e32f7d802 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 @@ -5,7 +5,6 @@ import com.yahoo.config.application.api.ApplicationFile; import com.yahoo.config.application.api.ApplicationMetaData; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; -import com.yahoo.config.provision.AllocatedHosts; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.TenantName; import com.yahoo.io.IOUtils; @@ -18,7 +17,6 @@ import com.yahoo.vespa.config.server.application.ApplicationSet; import com.yahoo.vespa.config.server.application.TenantApplications; import com.yahoo.vespa.config.server.configchange.ConfigChangeActions; import com.yahoo.vespa.config.server.host.HostValidator; -import com.yahoo.vespa.config.server.tenant.TenantRepository; import com.yahoo.vespa.curator.Curator; import java.io.File; @@ -35,7 +33,7 @@ import java.util.logging.Level; */ // This is really the store of an application, whether it is active or in an edit session // TODO: Separate the "application store" and "session" aspects - the latter belongs in the HTTP layer -bratseth -public class LocalSession extends Session implements Comparable<LocalSession> { +public class LocalSession extends Session { protected final ApplicationPackage applicationPackage; private final TenantApplications applicationRepo; @@ -118,13 +116,6 @@ public class LocalSession extends Session implements Comparable<LocalSession> { transaction.add(FileTransaction.from(FileOperations.delete(serverDBSessionDir.getAbsolutePath()))); } - @Override - public int compareTo(LocalSession rhs) { - Long lhsId = getSessionId(); - Long rhsId = rhs.getSessionId(); - return lhsId.compareTo(rhsId); - } - public void waitUntilActivated(TimeoutBudget timeoutBudget) { zooKeeperClient.getActiveWaiter().awaitCompletion(timeoutBudget.timeLeft()); } @@ -137,21 +128,6 @@ public class LocalSession extends Session implements Comparable<LocalSession> { return applicationPackage.getMetaData(); } - public AllocatedHosts getAllocatedHosts() { - return zooKeeperClient.getAllocatedHosts(); - } - - public TenantName getTenantName() { return tenant; } - - @Override - public String logPre() { - if (getApplicationId().equals(ApplicationId.defaultId())) { - return TenantRepository.logPre(getTenant()); - } else { - return TenantRepository.logPre(getApplicationId()); - } - } - // The rest of this class should be moved elsewhere ... private static class FileTransaction extends AbstractTransaction { 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(); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java index 7803bd05e0a..8b078f152f3 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java @@ -21,7 +21,7 @@ import java.util.Optional; * * @author Ulf Lilleengen */ -public abstract class Session { +public abstract class Session implements Comparable<Session> { private final long sessionId; protected final TenantName tenant; @@ -64,17 +64,19 @@ public abstract class Session { return Status.NEW; } } - - public TenantName getTenant() { - return tenant; - } + + public TenantName getTenantName() { return tenant; } /** * Helper to provide a log message preamble for code dealing with sessions * @return log preamble */ public String logPre() { - return TenantRepository.logPre(getTenant()); + if (getApplicationId().equals(ApplicationId.defaultId())) { + return TenantRepository.logPre(getTenantName()); + } else { + return TenantRepository.logPre(getApplicationId()); + } } public Instant getCreateTime() { @@ -128,4 +130,11 @@ public abstract class Session { // Note: Assumes monotonically increasing session ids public boolean isNewerThan(long sessionId) { return getSessionId() > sessionId; } + @Override + public int compareTo(Session rhs) { + Long lhsId = getSessionId(); + Long rhsId = rhs.getSessionId(); + return lhsId.compareTo(rhsId); + } + } |