Remove stor-devices

3 files changed, 6 insertions, 47 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 55a2a27f18c..3ee1472338e 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
@@ -3,7 +3,6 @@ package com.yahoo.vespa.model.content;
 
 import com.yahoo.vespa.config.content.StorFilestorConfig;
 import com.yahoo.vespa.config.content.core.StorBucketmoverConfig;
-import com.yahoo.vespa.config.storage.StorDevicesConfig;
 import com.yahoo.vespa.config.content.core.StorServerConfig;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.config.storage.StorMemfilepersistenceConfig;
@@ -21,16 +20,13 @@ import java.util.Arrays;
 /**
  * Class to provide config related to a specific storage node.
  */
-@RestartConfigs({StorDevicesConfig.class, StorFilestorConfig.class,
-                 StorMemfilepersistenceConfig.class, StorBucketmoverConfig.class})
-public class StorageNode extends ContentNode implements StorServerConfig.Producer, StorDevicesConfig.Producer {
+@RestartConfigs({StorFilestorConfig.class, StorMemfilepersistenceConfig.class, StorBucketmoverConfig.class})
+public class StorageNode extends ContentNode implements StorServerConfig.Producer {
 
-    static final String rootFolder = Defaults.getDefaults().underVespaHome("var/db/vespa/vds/");
+    static final String rootFolder = Defaults.getDefaults().underVespaHome("var/db/vespa/search/");
 
     private final Double capacity;
     private final boolean retired;
-    private final boolean isHostedVespa;
-    private boolean usesVdsEngine = false;
 
     public static class Builder extends VespaDomBuilder.DomConfigProducerBuilder<StorageNode> {
         @Override
@@ -47,7 +43,6 @@ public class StorageNode extends ContentNode implements StorServerConfig.Produce
               distributionKey);
         this.retired = retired;
         this.capacity = capacity;
-        this.isHostedVespa = cluster.getRoot().getDeployState().getProperties().hostedVespa();
     }
 
     @Override
@@ -57,31 +52,6 @@ public class StorageNode extends ContentNode implements StorServerConfig.Produce
                 : "exec sbin/vespa-storaged -c $VESPA_CONFIG_ID";
     }
 
-    @Override
-    public void getConfig(StorDevicesConfig.Builder builder) {
-        String root_folder = getRootDirectory();
-        builder.root_folder(root_folder);
-
-        // For VDS in hosted Vespa, we default to using the root_folder as the disk to store the data in.
-        // Setting disk_path will then
-        if (isHostedVespa && usesVdsEngine) {
-            // VDS looks up the first disk at the directory path root_folder/disks/d0.
-            builder.disk_path(Arrays.asList(root_folder + "/disks/d0"));
-        }
-    }
-
-    // 2015-08-11: Needed because of the following circular dependency:
-    // 1. StorageNode is created.
-    // 2. A particular persistence engine is picked depending on things (like the presence of engine/proton element)
-    //    that are hidden from the code creating the StorageNode in (1).
-    // 3. The persistence engine depends on the StorageNode, e.g. it's a parent node.
-    //
-    // If the VDSEngine is picked in (2), we would like to know this in StorageNode::getConfig(). Hence this setter.
-    public void useVdsEngine() {
-        usesVdsEngine = true;
-    }
-
-
     public double getCapacity() {
         if (capacity != null) {
             return capacity;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
index 924c282d2e5..547ff354b41 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
@@ -13,7 +13,6 @@ import com.yahoo.vespa.config.content.core.StorCommunicationmanagerConfig;
 import com.yahoo.vespa.config.content.core.StorServerConfig;
 import com.yahoo.vespa.config.content.core.StorStatusConfig;
 import com.yahoo.vespa.config.search.core.ProtonConfig;
-import com.yahoo.vespa.config.storage.StorDevicesConfig;
 import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 import com.yahoo.vespa.model.AbstractService;
 import com.yahoo.vespa.model.admin.monitoring.Monitoring;
@@ -39,7 +38,7 @@ import java.util.Optional;
  * @author hmusum
  */
 @RestartConfigs({ProtonConfig.class, MetricsmanagerConfig.class, TranslogserverConfig.class,
-                 StorDevicesConfig.class, StorFilestorConfig.class, StorBucketmoverConfig.class,
+                 StorFilestorConfig.class, StorBucketmoverConfig.class,
                  StorCommunicationmanagerConfig.class, StorStatusConfig.class,
                  StorServerConfig.class, LoadTypeConfig.class})
 public class SearchNode extends AbstractService implements
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
index d52b07a318a..373b2d90ad6 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
@@ -6,20 +6,17 @@ import com.yahoo.vespa.config.content.core.StorVisitorConfig;
 import com.yahoo.vespa.config.content.StorFilestorConfig;
 import com.yahoo.vespa.config.content.core.StorServerConfig;
 import com.yahoo.vespa.config.content.PersistenceConfig;
-import com.yahoo.vespa.config.storage.StorDevicesConfig;
 import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.documentmodel.NewDocumentType;
-import com.yahoo.text.XML;
 import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
 import com.yahoo.vespa.model.content.storagecluster.StorageCluster;
 import com.yahoo.vespa.model.content.utils.ContentClusterUtils;
 import org.junit.Test;
-import org.w3c.dom.Document;
 
-import java.util.Collections;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 public class StorageClusterTest {
 
@@ -195,13 +192,6 @@ public class StorageClusterTest {
         StorageNode node = cluster.getStorageNodes().getChildren().get("0");
 
         {
-            StorDevicesConfig.Builder builder = new StorDevicesConfig.Builder();
-            node.getConfig(builder);
-            StorDevicesConfig config = new StorDevicesConfig(builder);
-            assertEquals(getDefaults().underVespaHome("var/db/vespa/vds/storage/storage/0"), config.root_folder());
-        }
-
-        {
             StorServerConfig.Builder builder = new StorServerConfig.Builder();
             cluster.getStorageNodes().getConfig(builder);
             node.getConfig(builder);