diff options
| author | jonmv <venstad@gmail.com> | 2024-01-17 09:47:45 +0100 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2024-01-18 09:14:52 +0100 |
| commit | 690e3c6cd32c157c31679e1a9516ec9afc58982f (patch) | |
| tree | 97d9c776d82d260bf457addb2989792ceb5a30b8 /configserver | |
| parent | e064581436c09f6612f58883c765bd4ec26dceef (diff) | |
Activation failure also when base session changed from empty to something
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java index 80edbac9a43..cac297f061a 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java @@ -544,7 +544,6 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye static void checkIfActiveHasChanged(Session session, Session activeSession, boolean ignoreStaleSessionFailure) { long activeSessionAtCreate = session.getActiveSessionAtCreate(); log.log(Level.FINE, () -> activeSession.logPre() + "active session id at create time=" + activeSessionAtCreate); - if (activeSessionAtCreate == 0) return; // No active session at create time long sessionId = session.getSessionId(); long activeSessionSessionId = activeSession.getSessionId(); @@ -552,10 +551,10 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye ", current active session=" + activeSessionSessionId); if (activeSession.isNewerThan(activeSessionAtCreate) && activeSessionSessionId != sessionId) { - String errMsg = activeSession.logPre() + "Cannot activate session " + - sessionId + " because the currently active session (" + - activeSessionSessionId + ") has changed since session " + sessionId + - " was created (was " + activeSessionAtCreate + " at creation time)"; + String errMsg = activeSession.logPre() + "Cannot activate session " + sessionId + + " because the currently active session (" + activeSessionSessionId + + ") has changed since session " + sessionId + " was created (was " + + (activeSessionAtCreate == 0 ? "empty" : activeSessionAtCreate) + " at creation time)"; if (ignoreStaleSessionFailure) { log.warning(errMsg + " (Continuing because of force.)"); } else { |