diff options
author | Harald Musum <musum@yahoo-inc.com> | 2017-09-26 09:14:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-26 09:14:31 +0200 |
commit | af3e3e4200597607ca91678fe4ba4869dc7a65f9 (patch) | |
tree | 899c9567ca6636fcf7ab7fcf2fb3b87fb7ccef40 | |
parent | eba935248e99605a42eaccbdebfd53dea7e983ef (diff) | |
parent | 0d75200cc714916f5283fe85cdd38014ff69703b (diff) |
Merge pull request #3534 from vespa-engine/hmusum/check-for-new-or-removed-session-when-reconnected
Check for sessions changed after reconnecting
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java index d7c973617c2..659a44bb339 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java @@ -139,7 +139,7 @@ public class RemoteSessionRepo extends SessionRepo<RemoteSession> implements Nod return sessions; } - synchronized void sessionsChanged() throws NumberFormatException { + private synchronized void sessionsChanged() throws NumberFormatException { List<Long> sessions = getSessionList(directoryCache.getCurrentData()); checkForRemovedSessions(sessions); checkForAddedSessions(sessions); @@ -236,6 +236,9 @@ public class RemoteSessionRepo extends SessionRepo<RemoteSession> implements Nod case CHILD_REMOVED: sessionsChanged(); break; + case CONNECTION_RECONNECTED: + sessionsChanged(); + break; } } @@ -245,7 +248,6 @@ public class RemoteSessionRepo extends SessionRepo<RemoteSession> implements Nod if (session == null) continue; // session might have been deleted after getting session list log.log(LogLevel.DEBUG, session.logPre() + "Confirming upload for session " + sessionId); session.confirmUpload(); - } } } |