Remove some vds leftovers

5 files changed, 2 insertions, 21 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
index 40c4089a796..b7e6b8080a7 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
@@ -309,10 +309,6 @@ public class VespaMetricSet {
         metrics.add(new Metric("vds.filestor.alldisks.queuesize.average","diskqueuesize"));
         metrics.add(new Metric("vds.filestor.alldisks.averagequeuewait.sum.average","diskqueuewait"));
 
-        metrics.add(new Metric("vds.memfilepersistence.cache.files.average"));
-        metrics.add(new Metric("vds.memfilepersistence.cache.body.average"));
-        metrics.add(new Metric("vds.memfilepersistence.cache.header.average"));
-        metrics.add(new Metric("vds.memfilepersistence.cache.meta.average"));
         metrics.add(new Metric("vds.visitor.allthreads.queuesize.count.average"));
         metrics.add(new Metric("vds.visitor.allthreads.completed.sum.average"));
         metrics.add(new Metric("vds.visitor.allthreads.created.sum.rate","visit"));
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 c8eceacc36d..55a2a27f18c 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
@@ -72,7 +72,7 @@ public class StorageNode extends ContentNode implements StorServerConfig.Produce
 
     // 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/vds element)
+    // 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.
     //
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
index cc17c46146f..4fcac56d0c0 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
@@ -747,7 +747,7 @@ public class ContentBuilderTest extends DomBuilderTest {
                 "        <node hostalias='mockhost' distribution-key='0' />\n" +
                 "      </group>\n" +
                 "      <engine>\n" +
-                "       <vds/>\n" +
+                "       <dummy/>\n" +
                 "      </engine>\n" +
                 "  </content>\n");
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ClusterTest.java
index 1c8f572ce8d..33bd5084138 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ClusterTest.java
@@ -431,9 +431,6 @@ public class ClusterTest extends ContentBaseTest {
         cluster = parse(
             "<content version=\"1.0\" id=\"storage\">\n" +
             "  <documents/>" +
-            "  <engine>" +
-            "    <vds/>" +
-            "  </engine>" +
             "  <group>\n" +
             "    <node distribution-key=\"0\" hostalias=\"mockhost\"/>\n" +
             "  </group>\n" +
@@ -463,9 +460,6 @@ public class ClusterTest extends ContentBaseTest {
         cluster = parse(
             "<content version=\"1.0\" id=\"storage\">\n" +
             "  <documents/>" +
-            "  <engine>" +
-            "    <vds/>" +
-            "  </engine>" +
             "  <group>\n" +
             "    <node distribution-key=\"0\" hostalias=\"mockhost\"/>\n" +
             "  </group>\n" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/DistributorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/DistributorTest.java
index bdb64877fea..8ae68468374 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/DistributorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/DistributorTest.java
@@ -70,9 +70,6 @@ public class DistributorTest {
         StorDistributormanagerConfig.Builder builder = new StorDistributormanagerConfig.Builder();
         parse("<cluster id=\"storage\">\n" +
                 "  <documents/>" +
-                "    <engine>" +
-                "       <vds/>" +
-                "    </engine>" +
                 "    <tuning>\n" +
                 "      <bucket-splitting max-documents=\"2K\" max-size=\"25M\" minimum-bits=\"8\" />\n" +
                 "    </tuning>\n" +
@@ -96,9 +93,6 @@ public class DistributorTest {
         StorDistributormanagerConfig.Builder builder = new StorDistributormanagerConfig.Builder();
         ContentCluster cluster = parseCluster("<cluster id=\"storage\">\n" +
                 "  <documents/>" +
-                "    <engine>" +
-                "       <vds/>" +
-                "    </engine>" +
                 "    <tuning>" +
                 "      <distribution type=\"legacy\"/>" +
                 "    </tuning>\n" +
@@ -120,9 +114,6 @@ public class DistributorTest {
 
         cluster = parseCluster("<cluster id=\"storage\">\n" +
                 "  <documents/>" +
-                "    <engine>" +
-                "       <vds/>" +
-                "    </engine>" +
                 "    <tuning>" +
                 "      <distribution type=\"legacy\"/>" +
                 "    </tuning>\n" +