Use injected ConfigServerDB

6 files changed, 19 insertions, 6 deletions

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 6828204b17c..e7f048c28e8 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
@@ -39,5 +39,6 @@ public interface GlobalComponentRegistry {
     Optional<Provisioner> getHostProvisioner();
     Zone getZone();
     Clock getClock();
+    ConfigServerDB getConfigServerDB();
 
 }
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 88f54e569df..e7862f29399 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
@@ -40,7 +40,9 @@ public class InjectedGlobalComponentRegistry implements GlobalComponentRegistry
     private final HostRegistries hostRegistries;
     private final Optional<Provisioner> hostProvisioner;
     private final Zone zone;
+    private final ConfigServerDB configServerDB;
 
+    @SuppressWarnings("WeakerAccess")
     @Inject
     public InjectedGlobalComponentRegistry(Curator curator,
                                            ConfigCurator configCurator,
@@ -54,7 +56,8 @@ public class InjectedGlobalComponentRegistry implements GlobalComponentRegistry
                                            PermanentApplicationPackage permanentApplicationPackage,
                                            HostRegistries hostRegistries,
                                            HostProvisionerProvider hostProvisionerProvider,
-                                           Zone zone) {
+                                           Zone zone,
+                                           ConfigServerDB configServerDB) {
         this.curator = curator;
         this.configCurator = configCurator;
         this.metrics = metrics;
@@ -68,6 +71,7 @@ public class InjectedGlobalComponentRegistry implements GlobalComponentRegistry
         this.hostRegistries = hostRegistries;
         this.hostProvisioner = hostProvisionerProvider.getHostProvisioner();
         this.zone = zone;
+        this.configServerDB = configServerDB;
     }
 
     @Override
@@ -107,4 +111,7 @@ public class InjectedGlobalComponentRegistry implements GlobalComponentRegistry
 
     @Override
     public Clock getClock() {return  Clock.systemUTC();}
+
+    @Override
+    public ConfigServerDB getConfigServerDB() { return configServerDB; }
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/TenantFileSystemDirs.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/TenantFileSystemDirs.java
index 293f35558cb..587015362c8 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/TenantFileSystemDirs.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/TenantFileSystemDirs.java
@@ -1,7 +1,6 @@
 // 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.deploy;
 
-import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.io.IOUtils;
 import com.yahoo.path.Path;
@@ -19,8 +18,8 @@ public class TenantFileSystemDirs {
     private final File serverDB;
     private final TenantName tenant;
 
-    public TenantFileSystemDirs(ConfigserverConfig configserverConfig, TenantName tenant) {
-        this(new ConfigServerDB(configserverConfig).path(), tenant);
+    public TenantFileSystemDirs(ConfigServerDB configServerDB, TenantName tenant) {
+        this(configServerDB.path(), tenant);
     }
 
     // For testing
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantBuilder.java
index ad967f49964..8c66b19653c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantBuilder.java
@@ -160,7 +160,7 @@ public class TenantBuilder {
 
     private void createServerDbDirs() {
         if (tenantFileSystemDirs == null) {
-            tenantFileSystemDirs = new TenantFileSystemDirs(componentRegistry.getConfigserverConfig(), tenant);
+            tenantFileSystemDirs = new TenantFileSystemDirs(componentRegistry.getConfigServerDB(), tenant);
         }
     }
 
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 5ca3deab1fe..0c031556525 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
@@ -73,7 +73,8 @@ public class InjectedGlobalComponentRegistryTest {
         zone = Zone.defaultZone();
         globalComponentRegistry =
                 new InjectedGlobalComponentRegistry(curator, configCurator, metrics, modelFactoryRegistry, sessionPreparer, rpcServer, configserverConfig,
-                                                    generationCounter, defRepo, permanentApplicationPackage, hostRegistries, hostProvisionerProvider, zone);
+                                                    generationCounter, defRepo, permanentApplicationPackage, hostRegistries, hostProvisionerProvider, zone,
+                                                    new ConfigServerDB(configserverConfig));
     }
 
     @Test
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 e4e45d3a014..d2965b8a489 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
@@ -51,6 +51,7 @@ public class TestComponentRegistry implements GlobalComponentRegistry {
     private final Optional<Provisioner> hostProvisioner;
     private final Zone zone;
     private final Clock clock;
+    private final ConfigServerDB configServerDB;
 
     private TestComponentRegistry(Curator curator, ConfigCurator configCurator, Metrics metrics,
                                   ModelFactoryRegistry modelFactoryRegistry,
@@ -82,6 +83,7 @@ public class TestComponentRegistry implements GlobalComponentRegistry {
         this.sessionPreparer = sessionPreparer;
         this.zone = zone;
         this.clock = clock;
+        this.configServerDB = new ConfigServerDB(configserverConfig);
     }
 
     public static class Builder {
@@ -206,6 +208,9 @@ public class TestComponentRegistry implements GlobalComponentRegistry {
     }
     @Override
     public Clock getClock() { return clock;}
+    @Override
+    public ConfigServerDB getConfigServerDB() { return configServerDB;}
+
 
     public FileDistributionFactory getFileDistributionFactory() { return fileDistributionFactory; }