diff options
-rw-r--r-- | configdefinitions/src/vespa/configserver.def | 3 | ||||
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionRepo.java | 24 |
2 files changed, 11 insertions, 16 deletions
diff --git a/configdefinitions/src/vespa/configserver.def b/configdefinitions/src/vespa/configserver.def index e6fef0c454b..88a637e3ecb 100644 --- a/configdefinitions/src/vespa/configserver.def +++ b/configdefinitions/src/vespa/configserver.def @@ -64,6 +64,9 @@ sleepTimeWhenRedeployingFails long default=30 # Features (to be overridden in configserver-config.xml if needed) buildMinimalSetOfConfigModels bool default=true throwIfBootstrappingTenantRepoFails bool default=true + +# Unused, remove in Vespa 8 throwIfActiveSessionCannotBeLoaded bool default=true + canReturnEmptySentinelConfig bool default=false serverNodeType enum {config, controller} default=config 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 c27b7c6802b..859f9af5144 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 @@ -30,7 +30,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.Executor; -import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; @@ -46,7 +45,6 @@ public class RemoteSessionRepo extends SessionRepo<RemoteSession> { private static final Logger log = Logger.getLogger(RemoteSessionRepo.class.getName()); - private final GlobalComponentRegistry componentRegistry; private final Curator curator; private final Path sessionsPath; private final RemoteSessionFactory remoteSessionFactory; @@ -63,7 +61,6 @@ public class RemoteSessionRepo extends SessionRepo<RemoteSession> { ReloadHandler reloadHandler, TenantName tenantName, TenantApplications applicationRepo) { - this.componentRegistry = componentRegistry; this.curator = componentRegistry.getCurator(); this.sessionsPath = TenantRepository.getSessionsPath(tenantName); this.applicationRepo = applicationRepo; @@ -142,19 +139,14 @@ public class RemoteSessionRepo extends SessionRepo<RemoteSession> { */ private void sessionAdded(long sessionId) { log.log(Level.FINE, () -> "Adding session to RemoteSessionRepo: " + sessionId); - try { - RemoteSession session = remoteSessionFactory.createSession(sessionId); - Path sessionPath = sessionsPath.append(String.valueOf(sessionId)); - Curator.FileCache fileCache = curator.createFileCache(sessionPath.append(ConfigCurator.SESSIONSTATE_ZK_SUBPATH).getAbsolute(), false); - fileCache.addListener(this::nodeChanged); - loadSessionIfActive(session); - addSession(session); - metrics.incAddedSessions(); - sessionStateWatchers.put(sessionId, new RemoteSessionStateWatcher(fileCache, reloadHandler, session, metrics, zkWatcherExecutor)); - } catch (Exception e) { - if (componentRegistry.getConfigserverConfig().throwIfActiveSessionCannotBeLoaded()) throw e; - log.log(Level.WARNING, "Failed loading session " + sessionId + ": No config for this session can be served", e); - } + RemoteSession session = remoteSessionFactory.createSession(sessionId); + Path sessionPath = sessionsPath.append(String.valueOf(sessionId)); + Curator.FileCache fileCache = curator.createFileCache(sessionPath.append(ConfigCurator.SESSIONSTATE_ZK_SUBPATH).getAbsolute(), false); + fileCache.addListener(this::nodeChanged); + loadSessionIfActive(session); + addSession(session); + metrics.incAddedSessions(); + sessionStateWatchers.put(sessionId, new RemoteSessionStateWatcher(fileCache, reloadHandler, session, metrics, zkWatcherExecutor)); } private void sessionRemoved(long sessionId) { |