Remove stor-memfilepersistence config

3 files changed, 8 insertions, 28 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java
index 3ee1472338e..74576b45584 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java
@@ -5,7 +5,6 @@ import com.yahoo.vespa.config.content.StorFilestorConfig;
 import com.yahoo.vespa.config.content.core.StorBucketmoverConfig;
 import com.yahoo.vespa.config.content.core.StorServerConfig;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
-import com.yahoo.vespa.config.storage.StorMemfilepersistenceConfig;
 import com.yahoo.vespa.defaults.Defaults;
 import com.yahoo.vespa.model.application.validation.RestartConfigs;
 import com.yahoo.vespa.model.builder.xml.dom.ModelElement;
@@ -15,12 +14,10 @@ import com.yahoo.vespa.model.content.engines.ProtonProvider;
 import com.yahoo.vespa.model.content.storagecluster.StorageCluster;
 import org.w3c.dom.Element;
 
-import java.util.Arrays;
-
 /**
  * Class to provide config related to a specific storage node.
  */
-@RestartConfigs({StorFilestorConfig.class, StorMemfilepersistenceConfig.class, StorBucketmoverConfig.class})
+@RestartConfigs({StorFilestorConfig.class, StorBucketmoverConfig.class})
 public class StorageNode extends ContentNode implements StorServerConfig.Producer {
 
     static final String rootFolder = Defaults.getDefaults().underVespaHome("var/db/vespa/search/");
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java
index 0fdafa1ddf6..10f39d1f499 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorageCluster.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.model.content.storagecluster;
 
 import com.yahoo.vespa.config.content.core.StorIntegritycheckerConfig;
-import com.yahoo.vespa.config.storage.StorMemfilepersistenceConfig;
 import com.yahoo.vespa.config.content.core.StorBucketmoverConfig;
 import com.yahoo.vespa.config.content.core.StorVisitorConfig;
 import com.yahoo.vespa.config.content.StorFilestorConfig;
@@ -22,7 +21,6 @@ import org.w3c.dom.Element;
 public class StorageCluster extends AbstractConfigProducer<StorageNode>
     implements StorServerConfig.Producer,
         StorBucketmoverConfig.Producer,
-        StorMemfilepersistenceConfig.Producer,
         StorIntegritycheckerConfig.Producer,
         StorFilestorConfig.Producer,
         StorVisitorConfig.Producer,
@@ -46,9 +44,6 @@ public class StorageCluster extends AbstractConfigProducer<StorageNode>
     }
 
     private Integer bucketMoverMaxFillAboveAverage = null;
-    private Long cacheSize = null;
-    private Double diskFullPercentage = null;
-
     private String clusterName;
     private FileStorProducer fileStorProducer;
     private IntegrityCheckerProducer integrityCheckerProducer;
@@ -80,18 +75,6 @@ public class StorageCluster extends AbstractConfigProducer<StorageNode>
     }
 
     @Override
-    public void getConfig(StorMemfilepersistenceConfig.Builder builder) {
-        if (cacheSize != null) {
-            builder.cache_size(cacheSize);
-        }
-
-        if (diskFullPercentage != null) {
-            builder.disk_full_factor(diskFullPercentage / 100.0);
-            builder.disk_full_factor_move(diskFullPercentage / 100.0 * 0.9);
-        }
-    }
-
-    @Override
     public void getConfig(MetricsmanagerConfig.Builder builder) {
         ContentCluster.getMetricBuilder("fleetcontroller", builder).
                 addedmetrics("vds.datastored.alldisks.docs").
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/GenericConfigTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/GenericConfigTest.java
index 75ddd8173c3..a65c4e50521 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/GenericConfigTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/GenericConfigTest.java
@@ -1,7 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.content;
 
-import com.yahoo.vespa.config.storage.StorMemfilepersistenceConfig;
+import com.yahoo.vespa.config.content.StorFilestorConfig;
 import com.yahoo.searchdefinition.parser.ParseException;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
@@ -28,8 +28,8 @@ public class GenericConfigTest {
     private String servicesXml() {
         return "" +
                 "<services version='1.0'>" +
-                "  <config name='vespa.config.storage.stor-memfilepersistence'>" +
-                "    <disk_full_factor>0.001</disk_full_factor> " +
+                "  <config name='vespa.config.content.stor-filestor'>" +
+                "    <num_threads>7</num_threads> " +
                 "  </config>" +
                 "  <admin  version=\"2.0\">" +
                 "    <adminserver hostalias=\"node0\" />" +
@@ -61,16 +61,16 @@ public class GenericConfigTest {
     public void config_override_on_root_is_visible_on_storage_cluster() throws Exception {
         StorageCluster cluster = model.getContentClusters().get("storage").getStorageNodes();
 
-        StorMemfilepersistenceConfig config = model.getConfig(StorMemfilepersistenceConfig.class, cluster.getConfigId());
-        assertThat(config.disk_full_factor(), is(0.001));
+        StorFilestorConfig config = model.getConfig(StorFilestorConfig.class, cluster.getConfigId());
+        assertThat(config.num_threads(), is(7));
     }
 
     @Test
     public void config_override_on_root_is_visible_on_content_cluster() throws Exception {
         ContentCluster cluster = model.getContentClusters().get("storage");
 
-        StorMemfilepersistenceConfig config = model.getConfig(StorMemfilepersistenceConfig.class, cluster.getConfigId());
-        assertThat(config.disk_full_factor(), is(0.001));
+        StorFilestorConfig config = model.getConfig(StorFilestorConfig.class, cluster.getConfigId());
+        assertThat(config.num_threads(), is(7));
     }
 
 }