diff options
author | Jon Bratseth <bratseth@oath.com> | 2021-03-12 09:36:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-12 09:36:37 +0100 |
commit | 269a99c45b1020e942bff58a12c77dad4626780b (patch) | |
tree | 4fe346e5f8cbcf349c8b394d0f85f401942ea8df /configserver | |
parent | dd8c1a0e61639d0bd5bc3816f205420b5f187632 (diff) | |
parent | 53692c98aedf03af444a339be389b372b49bee18 (diff) |
Merge pull request #16895 from vespa-engine/bratseth/support-equiv-in-semantic-rules
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 f56e74c2869..b4d3f305f61 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 @@ -417,19 +417,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 |