diff options
author | Jon Bratseth <bratseth@gmail.com> | 2021-03-11 10:43:35 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2021-03-11 10:43:35 +0100 |
commit | 53692c98aedf03af444a339be389b372b49bee18 (patch) | |
tree | d0bedc47f9fd028f051b4974e0963a2ab0936dc3 /configserver | |
parent | d8aba5c8b45ec3871eb808b8b69cbe76b4f409b8 (diff) |
Support equiv
Diffstat (limited to 'configserver')
2 files changed, 0 insertions, 17 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java index 5400b898de3..39ac766bcb1 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java @@ -419,19 +419,6 @@ public class SessionRepository { log.log(Level.INFO, session.logPre() + "Session activated: " + sessionId); } - public void delete(Session remoteSession) { - long sessionId = remoteSession.getSessionId(); - log.log(Level.FINE, () -> remoteSession.logPre() + "Deactivating and deleting remote session " + sessionId); - createSetStatusTransaction(remoteSession, Session.Status.DELETE).commit(); - deleteRemoteSessionFromZooKeeper(remoteSession); - remoteSessionCache.remove(sessionId); - LocalSession localSession = getLocalSession(sessionId); - if (localSession != null) { - log.log(Level.FINE, () -> localSession.logPre() + "Deleting local session " + sessionId); - deleteLocalSession(localSession); - } - } - private Optional<RemoteSession> loadSessionIfActive(RemoteSession session) { for (ApplicationId applicationId : applicationRepo.activeApplications()) { if (applicationRepo.requireActiveSessionOf(applicationId) == session.getSessionId()) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java index a1d436a7c0b..a3025cbf364 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionRepositoryTest.java @@ -155,10 +155,6 @@ public class SessionRepositoryTest { assertRemoteSessionStatus(sessionId, Session.Status.NEW); assertStatusChange(sessionId, Session.Status.PREPARE); assertStatusChange(sessionId, Session.Status.ACTIVATE); - - sessionRepository.delete(sessionRepository.getRemoteSession(sessionId)); - assertSessionRemoved(sessionId); - assertNull(sessionRepository.getRemoteSession(sessionId)); } // If reading a session throws an exception it should be handled and not prevent other applications |