From f1975af4e4aa427124ebca63fe16ad3cbfdaf259 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Tue, 11 Dec 2018 11:22:51 +0100 Subject: Cleanup config definition repos and cache a bit --- .../config/server/GlobalComponentRegistry.java | 2 +- .../server/InjectedGlobalComponentRegistry.java | 8 +-- .../com/yahoo/vespa/config/server/ServerCache.java | 2 +- .../config/server/StaticConfigDefinitionRepo.java | 1 + .../config/server/UserConfigDefinitionRepo.java | 21 ++++++- .../config/server/application/Application.java | 3 +- .../modelfactory/ActivatedModelsBuilder.java | 9 ++- .../server/session/RemoteSessionFactory.java | 4 -- .../config/server/session/ServerCacheLoader.java | 67 ---------------------- .../config/server/session/SessionFactoryImpl.java | 5 -- .../server/session/SessionZooKeeperClient.java | 12 ++-- .../InjectedGlobalComponentRegistryTest.java | 2 +- .../vespa/config/server/TestComponentRegistry.java | 2 +- .../config/server/session/SessionPreparerTest.java | 2 +- 14 files changed, 41 insertions(+), 99 deletions(-) delete mode 100644 configserver/src/main/java/com/yahoo/vespa/config/server/session/ServerCacheLoader.java (limited to 'configserver/src') diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/GlobalComponentRegistry.java b/configserver/src/main/java/com/yahoo/vespa/config/server/GlobalComponentRegistry.java index e7f048c28e8..5987532c004 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/GlobalComponentRegistry.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/GlobalComponentRegistry.java @@ -32,7 +32,7 @@ public interface GlobalComponentRegistry { TenantListener getTenantListener(); ReloadListener getReloadListener(); SuperModelGenerationCounter getSuperModelGenerationCounter(); - ConfigDefinitionRepo getConfigDefinitionRepo(); + ConfigDefinitionRepo getStaticConfigDefinitionRepo(); PermanentApplicationPackage getPermanentApplicationPackage(); HostRegistries getHostRegistries(); ModelFactoryRegistry getModelFactoryRegistry(); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/InjectedGlobalComponentRegistry.java b/configserver/src/main/java/com/yahoo/vespa/config/server/InjectedGlobalComponentRegistry.java index e7862f29399..587eb5857bf 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/InjectedGlobalComponentRegistry.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/InjectedGlobalComponentRegistry.java @@ -35,7 +35,7 @@ public class InjectedGlobalComponentRegistry implements GlobalComponentRegistry private final RpcServer rpcServer; private final ConfigserverConfig configserverConfig; private final SuperModelGenerationCounter superModelGenerationCounter; - private final ConfigDefinitionRepo defRepo; + private final ConfigDefinitionRepo staticConfigDefinitionRepo; private final PermanentApplicationPackage permanentApplicationPackage; private final HostRegistries hostRegistries; private final Optional hostProvisioner; @@ -52,7 +52,7 @@ public class InjectedGlobalComponentRegistry implements GlobalComponentRegistry RpcServer rpcServer, ConfigserverConfig configserverConfig, SuperModelGenerationCounter superModelGenerationCounter, - ConfigDefinitionRepo defRepo, + ConfigDefinitionRepo staticConfigDefinitionRepo, PermanentApplicationPackage permanentApplicationPackage, HostRegistries hostRegistries, HostProvisionerProvider hostProvisionerProvider, @@ -66,7 +66,7 @@ public class InjectedGlobalComponentRegistry implements GlobalComponentRegistry this.rpcServer = rpcServer; this.configserverConfig = configserverConfig; this.superModelGenerationCounter = superModelGenerationCounter; - this.defRepo = defRepo; + this.staticConfigDefinitionRepo = staticConfigDefinitionRepo; this.permanentApplicationPackage = permanentApplicationPackage; this.hostRegistries = hostRegistries; this.hostProvisioner = hostProvisionerProvider.getHostProvisioner(); @@ -91,7 +91,7 @@ public class InjectedGlobalComponentRegistry implements GlobalComponentRegistry @Override public SuperModelGenerationCounter getSuperModelGenerationCounter() { return superModelGenerationCounter; } @Override - public ConfigDefinitionRepo getConfigDefinitionRepo() { return defRepo; } + public ConfigDefinitionRepo getStaticConfigDefinitionRepo() { return staticConfigDefinitionRepo; } @Override public PermanentApplicationPackage getPermanentApplicationPackage() { return permanentApplicationPackage; } @Override diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ServerCache.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ServerCache.java index 7d6463c49f1..ad544005ace 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ServerCache.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ServerCache.java @@ -20,7 +20,7 @@ public class ServerCache { private final ConfigDefinitionRepo builtinConfigDefinitions; private final ConfigDefinitionRepo userConfigDefinitions; - // NOTE: The reason we do a double mapping here is to dedup configs that have the same md5. + // NOTE: The reason we do a double mapping here is to de-dupe configs that have the same md5. private final Map md5Sums = new ConcurrentHashMap<>(); private final Map md5ToConfig = new ConcurrentHashMap<>(); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/StaticConfigDefinitionRepo.java b/configserver/src/main/java/com/yahoo/vespa/config/server/StaticConfigDefinitionRepo.java index abb573a7b81..d682456ebb7 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/StaticConfigDefinitionRepo.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/StaticConfigDefinitionRepo.java @@ -34,6 +34,7 @@ public class StaticConfigDefinitionRepo implements ConfigDefinitionRepo { }; } + @SuppressWarnings("unused") @Inject public StaticConfigDefinitionRepo(ConfigServerDB serverDB) { this.repo = new com.yahoo.config.model.application.provider.StaticConfigDefinitionRepo(serverDB.serverdefs()); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/UserConfigDefinitionRepo.java b/configserver/src/main/java/com/yahoo/vespa/config/server/UserConfigDefinitionRepo.java index 2f1798f14dd..30c68b3830c 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/UserConfigDefinitionRepo.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/UserConfigDefinitionRepo.java @@ -1,21 +1,40 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server; - +import com.google.common.base.Splitter; import com.yahoo.config.model.api.ConfigDefinitionRepo; +import com.yahoo.log.LogLevel; import com.yahoo.vespa.config.ConfigDefinitionKey; import com.yahoo.vespa.config.buildergen.ConfigDefinition; +import com.yahoo.vespa.config.server.zookeeper.ConfigCurator; +import com.yahoo.vespa.config.util.ConfigUtils; import java.util.LinkedHashMap; import java.util.Map; +import java.util.logging.Logger; /** * @author hmusum */ public class UserConfigDefinitionRepo implements ConfigDefinitionRepo { + private static final Logger log = Logger.getLogger(UserConfigDefinitionRepo.class.getName()); private final Map defs = new LinkedHashMap<>(); + // For testing only + public UserConfigDefinitionRepo() {} + + public UserConfigDefinitionRepo(ConfigCurator configCurator, String appPath) { + if (configCurator.exists(appPath)) { + for (String nodeName : configCurator.getChildren(appPath)) { + String payload = configCurator.getData(appPath, nodeName); + ConfigDefinitionKey dKey = ConfigUtils.createConfigDefinitionKeyFromZKString(nodeName); + defs.put(dKey, new ConfigDefinition(dKey.getName(), Splitter.on("\n").splitToList(payload).toArray(new String[0]))); + } + } else { + log.log(LogLevel.WARNING, "Path " + appPath + " does not exist, not able to load add user config definitions"); + } + } public void add(ConfigDefinitionKey key, ConfigDefinition configDefinition) { defs.put(key, configDefinition); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java index 0d787895087..06a4c12fb32 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/Application.java @@ -37,7 +37,7 @@ import java.util.Set; public class Application implements ModelResult { private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(Application.class.getName()); - private final long appGeneration; // The generation of the set of configs belonging to an application + private final long appGeneration; // The config generation for this application private final boolean internalRedeploy; private final Version vespaVersion; private final Model model; @@ -161,7 +161,6 @@ public class Application implements ModelResult { debug("No config schema in request for " + configKey); } return cache.getDef(configDefinitionKey); - } else { if (logDebug()) { debug("Got config schema from request, length:" + def.asList().size() + " : " + configKey); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java index 9871ce2e26b..89c5cedb05c 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ActivatedModelsBuilder.java @@ -15,6 +15,7 @@ import com.yahoo.component.Version; import com.yahoo.log.LogLevel; import com.yahoo.vespa.config.server.ConfigServerSpec; import com.yahoo.vespa.config.server.GlobalComponentRegistry; +import com.yahoo.vespa.config.server.ServerCache; import com.yahoo.vespa.config.server.provision.HostProvisionerProvider; import com.yahoo.vespa.config.server.tenant.Rotations; import com.yahoo.vespa.config.server.tenant.TenantRepository; @@ -63,7 +64,7 @@ public class ActivatedModelsBuilder extends ModelsBuilder { this.appGeneration = appGeneration; this.zkClient = zkClient; this.permanentApplicationPackage = globalComponentRegistry.getPermanentApplicationPackage(); - this.configDefinitionRepo = globalComponentRegistry.getConfigDefinitionRepo(); + this.configDefinitionRepo = globalComponentRegistry.getStaticConfigDefinitionRepo(); this.metrics = globalComponentRegistry.getMetrics(); this.curator = globalComponentRegistry.getCurator(); this.logger = new SilentDeployLogger(); @@ -92,12 +93,14 @@ public class ActivatedModelsBuilder extends ModelsBuilder { modelFactory.version(), wantedNodeVespaVersion); MetricUpdater applicationMetricUpdater = metrics.getOrCreateMetricUpdater(Metrics.createDimensions(applicationId)); + ServerCache serverCache = new ServerCache(configDefinitionRepo, zkClient.getUserConfigDefinitions()); return new Application(modelFactory.createModel(modelContext), - zkClient.loadServerCache(), + serverCache, appGeneration, applicationPackage.getMetaData().isInternalRedeploy(), modelFactory.version(), - applicationMetricUpdater, applicationId); + applicationMetricUpdater, + applicationId); } private static Optional getForVersionOrLatest(Map map, Version version) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionFactory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionFactory.java index d9265423c7d..0707260dffd 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionFactory.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSessionFactory.java @@ -3,7 +3,6 @@ package com.yahoo.vespa.config.server.session; import com.yahoo.config.provision.TenantName; import com.yahoo.path.Path; -import com.yahoo.config.model.api.ConfigDefinitionRepo; import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.vespa.config.server.GlobalComponentRegistry; import com.yahoo.vespa.config.server.tenant.TenantRepository; @@ -19,7 +18,6 @@ public class RemoteSessionFactory { private final Curator curator; private final ConfigCurator configCurator; private final Path sessionsPath; - private final ConfigDefinitionRepo defRepo; private final TenantName tenant; private final ConfigserverConfig configserverConfig; @@ -29,7 +27,6 @@ public class RemoteSessionFactory { this.configCurator = componentRegistry.getConfigCurator(); this.sessionsPath = TenantRepository.getSessionsPath(tenant); this.tenant = tenant; - this.defRepo = componentRegistry.getConfigDefinitionRepo(); this.configserverConfig = componentRegistry.getConfigserverConfig(); } @@ -38,7 +35,6 @@ public class RemoteSessionFactory { SessionZooKeeperClient sessionZKClient = new SessionZooKeeperClient(curator, configCurator, sessionPath, - defRepo, configserverConfig.serverId(), componentRegistry.getZone().nodeFlavors()); return new RemoteSession(tenant, sessionId, componentRegistry, sessionZKClient); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/ServerCacheLoader.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/ServerCacheLoader.java deleted file mode 100644 index 62e92f4ff08..00000000000 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/ServerCacheLoader.java +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.config.server.session; - -import com.google.common.base.Splitter; -import com.yahoo.config.model.api.ConfigDefinitionRepo; -import com.yahoo.path.Path; -import com.yahoo.vespa.config.ConfigDefinitionKey; -import com.yahoo.vespa.config.buildergen.ConfigDefinition; -import com.yahoo.vespa.config.server.ServerCache; -import com.yahoo.vespa.config.server.UserConfigDefinitionRepo; -import com.yahoo.vespa.config.util.ConfigUtils; -import com.yahoo.vespa.config.server.zookeeper.ConfigCurator; - -/** - * Loads config definitions from zookeeper and creates a {@link ServerCache} instance containing these - * and the builtin config definitions in memory. - * - * @author Ulf Lilleengen - */ -public class ServerCacheLoader { - - private final ConfigDefinitionRepo repo; - private final ConfigCurator configCurator; - private final Path path; - - ServerCacheLoader(ConfigCurator configCurator, Path rootPath, ConfigDefinitionRepo builtinConfigDefinitions) { - this.configCurator = configCurator; - this.path = rootPath; - this.repo = builtinConfigDefinitions; - } - - public ServerCache loadCache() { - return loadConfigDefinitions(); - } - - /** - * Reads config definitions from zookeeper, parses them and puts both ConfigDefinition instances - * and payload (raw config definition) into cache. - * - * @return the populated cache. - */ - private ServerCache loadConfigDefinitions() { - try { - return new ServerCache(repo, createUserConfigDefinitionsRepo(path.append(ConfigCurator.USER_DEFCONFIGS_ZK_SUBPATH).getAbsolute())); - } catch (Exception e) { - throw new IllegalStateException("Could not load user config definitions from " + path, e); - } - } - - /** - * Creates repo with user config definitions - * - * @param appPath the path to load config definitions from - */ - private UserConfigDefinitionRepo createUserConfigDefinitionsRepo(String appPath) { - UserConfigDefinitionRepo userConfigDefinitionRepo = new UserConfigDefinitionRepo(); - if ( ! configCurator.exists(appPath)) return userConfigDefinitionRepo; - - for (String nodeName : configCurator.getChildren(appPath)) { - String payload = configCurator.getData(appPath, nodeName); - ConfigDefinitionKey dKey = ConfigUtils.createConfigDefinitionKeyFromZKString(nodeName); - userConfigDefinitionRepo.add(dKey, new ConfigDefinition(dKey.getName(), Splitter.on("\n").splitToList(payload).toArray(new String[0]))); - } - return userConfigDefinitionRepo; - } - -} diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactoryImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactoryImpl.java index 6e34511c62d..a50114a4a82 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactoryImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionFactoryImpl.java @@ -4,7 +4,6 @@ package com.yahoo.vespa.config.server.session; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.model.application.provider.*; -import com.yahoo.config.model.api.ConfigDefinitionRepo; import com.yahoo.config.provision.NodeFlavors; import com.yahoo.io.IOUtils; import com.yahoo.log.LogLevel; @@ -47,7 +46,6 @@ public class SessionFactoryImpl implements SessionFactory, LocalSessionLoader { private final TenantFileSystemDirs tenantFileSystemDirs; private final HostValidator hostRegistry; private final SuperModelGenerationCounter superModelGenerationCounter; - private final ConfigDefinitionRepo defRepo; private final TenantName tenant; private final String serverId; private final Optional nodeFlavors; @@ -68,7 +66,6 @@ public class SessionFactoryImpl implements SessionFactory, LocalSessionLoader { this.applicationRepo = applicationRepo; this.tenantFileSystemDirs = tenantFileSystemDirs; this.superModelGenerationCounter = globalComponentRegistry.getSuperModelGenerationCounter(); - this.defRepo = globalComponentRegistry.getConfigDefinitionRepo(); this.serverId = globalComponentRegistry.getConfigserverConfig().serverId(); this.nodeFlavors = globalComponentRegistry.getZone().nodeFlavors(); this.clock = globalComponentRegistry.getClock(); @@ -146,7 +143,6 @@ public class SessionFactoryImpl implements SessionFactory, LocalSessionLoader { SessionZooKeeperClient sessionZooKeeperClient = new SessionZooKeeperClient(curator, configCurator, sessionIdPath, - defRepo, serverId, nodeFlavors); File userApplicationDir = tenantFileSystemDirs.getUserApplicationDir(sessionId); @@ -180,7 +176,6 @@ public class SessionFactoryImpl implements SessionFactory, LocalSessionLoader { SessionZooKeeperClient sessionZKClient = new SessionZooKeeperClient(curator, configCurator, sessionIdPath, - defRepo, serverId, nodeFlavors); SessionContext context = new SessionContext(applicationPackage, sessionZKClient, sessionDir, applicationRepo, diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java index 2049a7f9eb0..727d4e6d7bc 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java @@ -13,9 +13,8 @@ import com.yahoo.log.LogLevel; import com.yahoo.path.Path; import com.yahoo.config.model.api.ConfigDefinitionRepo; import com.yahoo.text.Utf8; -import com.yahoo.vespa.config.server.StaticConfigDefinitionRepo; -import com.yahoo.vespa.config.server.ServerCache; import com.yahoo.config.provision.ApplicationId; +import com.yahoo.vespa.config.server.UserConfigDefinitionRepo; import com.yahoo.vespa.config.server.deploy.ZooKeeperClient; import com.yahoo.vespa.config.server.deploy.ZooKeeperDeployer; import com.yahoo.vespa.config.server.zookeeper.ZKApplicationPackage; @@ -47,18 +46,16 @@ public class SessionZooKeeperClient { private final Path sessionPath; private final Path sessionStatusPath; private final String serverId; - private final ServerCacheLoader cacheLoader; private final Optional nodeFlavors; // Only for testing when cache loader does not need cache entries. public SessionZooKeeperClient(Curator curator, Path sessionPath) { - this(curator, ConfigCurator.create(curator), sessionPath, new StaticConfigDefinitionRepo(), "", Optional.empty()); + this(curator, ConfigCurator.create(curator), sessionPath, "", Optional.empty()); } public SessionZooKeeperClient(Curator curator, ConfigCurator configCurator, Path sessionPath, - ConfigDefinitionRepo definitionRepo, String serverId, Optional nodeFlavors) { this.curator = curator; @@ -67,7 +64,6 @@ public class SessionZooKeeperClient { this.serverId = serverId; this.nodeFlavors = nodeFlavors; this.sessionStatusPath = sessionPath.append(ConfigCurator.SESSIONSTATE_ZK_SUBPATH); - this.cacheLoader = new ServerCacheLoader(configCurator, sessionPath, definitionRepo); } public void writeStatus(Session.Status sessionStatus) { @@ -148,8 +144,8 @@ public class SessionZooKeeperClient { return new ZKApplicationPackage(configCurator, sessionPath, nodeFlavors); } - public ServerCache loadServerCache() { - return cacheLoader.loadCache(); + public ConfigDefinitionRepo getUserConfigDefinitions() { + return new UserConfigDefinitionRepo(configCurator, sessionPath.append(ConfigCurator.USER_DEFCONFIGS_ZK_SUBPATH).getAbsolute()); } private String applicationIdPath() { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/InjectedGlobalComponentRegistryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/InjectedGlobalComponentRegistryTest.java index 0c031556525..324f7c5de00 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/InjectedGlobalComponentRegistryTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/InjectedGlobalComponentRegistryTest.java @@ -87,7 +87,7 @@ public class InjectedGlobalComponentRegistryTest { assertThat(globalComponentRegistry.getReloadListener().hashCode(), is(rpcServer.hashCode())); assertThat(globalComponentRegistry.getTenantListener().hashCode(), is(rpcServer.hashCode())); assertThat(globalComponentRegistry.getSuperModelGenerationCounter(), is(generationCounter)); - assertThat(globalComponentRegistry.getConfigDefinitionRepo(), is(defRepo)); + assertThat(globalComponentRegistry.getStaticConfigDefinitionRepo(), is(defRepo)); assertThat(globalComponentRegistry.getPermanentApplicationPackage(), is(permanentApplicationPackage)); assertThat(globalComponentRegistry.getHostRegistries(), is(hostRegistries)); assertThat(globalComponentRegistry.getZone(), is (zone)); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java b/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java index 58bd1485dad..2c89678c90f 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java @@ -177,7 +177,7 @@ public class TestComponentRegistry implements GlobalComponentRegistry { @Override public SuperModelGenerationCounter getSuperModelGenerationCounter() { return superModelGenerationCounter; } @Override - public ConfigDefinitionRepo getConfigDefinitionRepo() { return defRepo; } + public ConfigDefinitionRepo getStaticConfigDefinitionRepo() { return defRepo; } @Override public PermanentApplicationPackage getPermanentApplicationPackage() { return permanentApplicationPackage; } @Override diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java index 42acb1a1a24..6fe749b4493 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java @@ -103,7 +103,7 @@ public class SessionPreparerTest { hostProvisionerProvider, new PermanentApplicationPackage(componentRegistry.getConfigserverConfig()), componentRegistry.getConfigserverConfig(), - componentRegistry.getConfigDefinitionRepo(), + componentRegistry.getStaticConfigDefinitionRepo(), curator, componentRegistry.getZone()); } -- cgit v1.2.3