Remove the persistenceProviderPort and ports meta for rpc and smrp

10 files changed, 29 insertions, 97 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
index b54978f52d3..c4cfd6d185b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
@@ -204,7 +204,7 @@ public class ContentSearchCluster extends AbstractConfigProducer implements Prot
         return hasIndexedCluster() ? getIndexed().getSearchNodes() : nonIndexed;
     }
 
-    public SearchNode addSearchNode(ContentNode node, StorageGroup parentGroup, ModelElement element) {
+    public void addSearchNode(ContentNode node, StorageGroup parentGroup, ModelElement element) {
         AbstractConfigProducer parent = hasIndexedCluster() ? getIndexed() : this;
 
         NodeSpec spec = getNextSearchNodeSpec(parentGroup);
@@ -229,7 +229,6 @@ public class ContentSearchCluster extends AbstractConfigProducer implements Prot
         } else {
             nonIndexed.add(snode);
         }
-        return snode;
     }
 
     /** Translates group ids to continuous 0-base "row" id integers */
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/EngineFactoryBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/EngineFactoryBuilder.java
index 95193b03764..04c5fd4fd72 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/EngineFactoryBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/EngineFactoryBuilder.java
@@ -22,8 +22,6 @@ public class EngineFactoryBuilder {
                 return new ProtonEngine.Factory(c.getSearch());
             } else if (persistence.getChild("dummy") != null) {
                 return new com.yahoo.vespa.model.content.engines.DummyPersistence.Factory();
-            } else if (persistence.getChild("rpc") != null) {
-                return new RPCEngine.Factory();
             }
         }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonEngine.java b/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonEngine.java
index 9c655e62d32..df8cfc6f9bd 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonEngine.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonEngine.java
@@ -22,8 +22,8 @@ public class ProtonEngine {
 
         @Override
         public PersistenceEngine create(StorageNode storageNode, StorageGroup parentGroup, ModelElement storageNodeElement) {
-            SearchNode searchNode = search.addSearchNode(storageNode, parentGroup, storageNodeElement);
-            return new ProtonProvider(storageNode, searchNode);
+            search.addSearchNode(storageNode, parentGroup, storageNodeElement);
+            return new ProtonProvider(storageNode);
         }
 
         @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonProvider.java
index 9d6bccee7e4..ff3b4891146 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonProvider.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonProvider.java
@@ -1,14 +1,23 @@
 // 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.engines;
 
+import com.yahoo.vespa.config.content.core.StorServerConfig;
 import com.yahoo.vespa.model.content.StorageNode;
 import com.yahoo.vespa.model.search.SearchNode;
 
 /**
  * @author baldersheim
  */
-public class ProtonProvider extends RPCEngine {
-    public ProtonProvider(StorageNode parent, SearchNode searchNode) {
-        super(parent, searchNode);
+public class ProtonProvider extends PersistenceEngine {
+
+    public ProtonProvider(StorageNode parent) {
+        super(parent, "provider");
+    }
+
+    @Override
+    public void getConfig(StorServerConfig.Builder builder) {
+        StorServerConfig.Persistence_provider.Builder provider = new StorServerConfig.Persistence_provider.Builder();
+        provider.type(StorServerConfig.Persistence_provider.Type.Enum.RPC);
+        builder.persistence_provider(provider);
     }
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/engines/RPCEngine.java b/config-model/src/main/java/com/yahoo/vespa/model/content/engines/RPCEngine.java
deleted file mode 100644
index 8be2c0c4dd6..00000000000
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/engines/RPCEngine.java
+++ /dev/null
@@ -1,57 +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.model.content.engines;
-
-import com.yahoo.vespa.config.content.core.StorServerConfig;
-import com.yahoo.vespa.model.builder.xml.dom.ModelElement;
-import com.yahoo.vespa.model.content.StorageGroup;
-import com.yahoo.vespa.model.content.StorageNode;
-import com.yahoo.vespa.model.content.cluster.ContentCluster;
-import com.yahoo.vespa.model.search.SearchNode;
-
-public class RPCEngine extends PersistenceEngine {
-
-    private SearchNode searchNode;
-    public RPCEngine(StorageNode parent) {
-        super(parent, "provider");
-    }
-
-    public RPCEngine(StorageNode parent, SearchNode searchNode) {
-        super(parent, "provider");
-        this.searchNode = searchNode;
-    }
-
-    @Override
-    public void getConfig(StorServerConfig.Builder builder) {
-        StorServerConfig.Persistence_provider.Builder provider =
-                new StorServerConfig.Persistence_provider.Builder();
-        provider.type(StorServerConfig.Persistence_provider.Type.Enum.RPC);
-
-        if (searchNode != null) {
-            provider.rpc(new StorServerConfig.Persistence_provider.Rpc.Builder().connectspec("tcp/localhost:" + searchNode.getPersistenceProviderRpcPort()));
-        }
-
-        builder.persistence_provider(provider);
-    }
-
-    public static class Factory implements PersistenceFactory {
-        @Override
-        public PersistenceEngine create(StorageNode storageNode, StorageGroup parentGroup, ModelElement storageNodeElement) {
-            return new RPCEngine(storageNode);
-        }
-
-        @Override
-        public boolean supportRevert() {
-            return false;
-        }
-
-        @Override
-        public boolean enableMultiLevelSplitting() {
-            return false;
-        }
-
-        @Override
-        public ContentCluster.DistributionMode getDefaultDistributionMode() {
-            return ContentCluster.DistributionMode.LOOSE;
-        }
-    }
-}
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 336fbc74564..a54161daaac 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
@@ -103,9 +103,7 @@ public class SearchNode extends AbstractService implements
         this.flushOnShutdown = flushOnShutdown;
         portsMeta.on(0).tag("rpc").tag("rtc").tag("admin").tag("status");
         portsMeta.on(1).tag("fs4");
-        portsMeta.on(2).tag("srmp").tag("hack").tag("test");
-        portsMeta.on(3).tag("rpc").tag("engines-provider");
-        portsMeta.on(4).tag("http").tag("json").tag("health").tag("state");
+        portsMeta.on(2).tag("http").tag("json").tag("health").tag("state");
         // Properties are set in DomSearchBuilder
         monitorService();
         this.tuning = tuning;
@@ -145,7 +143,7 @@ public class SearchNode extends AbstractService implements
      */
     @Override
     public int getPortCount() {
-        return 5;
+        return 3;
     }
 
     /**
@@ -157,15 +155,6 @@ public class SearchNode extends AbstractService implements
         return getRelativePort(0);
     }
 
-    /*
-     * Returns the rpc port used for the engines provider interface.
-     * @return The port
-     */
-
-    public int getPersistenceProviderRpcPort() {
-        return getRelativePort(3);
-    }
-
     @Override
     public int getHealthPort() {
         return getHttpPort();
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 e1818008462..043f961f98e 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
@@ -318,8 +318,6 @@ public class ContentBuilderTest extends DomBuilderTest {
         assertTrue(partitionsConfig.dataset(0).engine(0).name_and_port().startsWith("tcp/node0:191"));
         IndexedSearchCluster sc = m.getContentClusters().get("clu").getSearch().getIndexed();
         assertEquals(2, sc.getSearchNodeCount());
-        assertTrue(sc.getSearchNode(0).getPersistenceProviderRpcPort() >= 19100);
-        assertTrue(sc.getSearchNode(0).getPersistenceProviderRpcPort() != sc.getSearchNode(1).getPersistenceProviderRpcPort());
     }
 
     @Test
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 5ba0c43fcee..2a3dbe002e6 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
@@ -506,7 +506,6 @@ public class ClusterTest extends ContentBaseTest {
             cluster.getStorageNodes().getConfig(builder);
             cluster.getStorageNodes().getChildren().get("0").getConfig(builder);
             StorServerConfig config = new StorServerConfig(builder);
-            assertEquals("tcp/localhost:19106", config.persistence_provider().rpc().connectspec());
         }
 
         {
@@ -514,7 +513,6 @@ public class ClusterTest extends ContentBaseTest {
             cluster.getStorageNodes().getConfig(builder);
             cluster.getStorageNodes().getChildren().get("1").getConfig(builder);
             StorServerConfig config = new StorServerConfig(builder);
-            assertEquals("tcp/localhost:19118", config.persistence_provider().rpc().connectspec());
         }
     }
 
@@ -602,7 +600,6 @@ public class ClusterTest extends ContentBaseTest {
     @Test
     public void testProviders() {
         testProvider("proton", StorServerConfig.Persistence_provider.Type.RPC);
-        testProvider("rpc", StorServerConfig.Persistence_provider.Type.RPC);
         testProvider("vds", StorServerConfig.Persistence_provider.Type.STORAGE);
         testProvider("dummy", StorServerConfig.Persistence_provider.Type.DUMMY);
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
index c1ed602f791..14e3bd72dc7 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
@@ -198,7 +198,6 @@ public class IndexedTest extends ContentBaseTest {
         StorServerConfig.Builder builder = new StorServerConfig.Builder();
         s.getStorageNodes().getConfig(builder);
         s.getStorageNodes().getChildren().get("3").getConfig(builder);
-        assertTrue(new StorServerConfig(builder).persistence_provider().rpc().connectspec().startsWith("tcp/localhost:191"));
     }
 
     @Test
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/MultilevelDispatchTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/MultilevelDispatchTest.java
index ff611d4ad0c..262ee409b5f 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/MultilevelDispatchTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/MultilevelDispatchTest.java
@@ -143,12 +143,12 @@ public class MultilevelDispatchTest {
         assertEquals("tlds/tld.0", tld.getConfigId());
         assertEquals(0, getFdispatchrcConfig(tld).dispatchlevel());
         new EngineAsserter(2, 6, tld).
-                assertEngine(0, 0, "tcp/mh0:19113").
-                assertEngine(1, 0, "tcp/mh1:19113").
-                assertEngine(2, 0, "tcp/mh2:19113").
-                assertEngine(0, 1, "tcp/mh3:19113").
-                assertEngine(1, 1, "tcp/mh4:19113").
-                assertEngine(2, 1, "tcp/mh5:19113");
+                assertEngine(0, 0, "tcp/mh0:19111").
+                assertEngine(1, 0, "tcp/mh1:19111").
+                assertEngine(2, 0, "tcp/mh2:19111").
+                assertEngine(0, 1, "tcp/mh3:19111").
+                assertEngine(1, 1, "tcp/mh4:19111").
+                assertEngine(2, 1, "tcp/mh5:19111");
 
         List<Dispatch> ds = getDispatchers(tld);
         assertEquals(6, ds.size());
@@ -253,12 +253,12 @@ public class MultilevelDispatchTest {
         assertEquals("tlds/tld.0", tld.getConfigId());
         assertEquals(0, getFdispatchrcConfig(tld).dispatchlevel());
         new EngineAsserter(2, 6, tld).
-                assertEngine(0, 0, "tcp/mh0:19113").
-                assertEngine(1, 0, "tcp/mh2:19113").
-                assertEngine(2, 0, "tcp/mh4:19113").
-                assertEngine(0, 1, "tcp/mh1:19113").
-                assertEngine(1, 1, "tcp/mh3:19113").
-                assertEngine(2, 1, "tcp/mh5:19113");
+                assertEngine(0, 0, "tcp/mh0:19111").
+                assertEngine(1, 0, "tcp/mh2:19111").
+                assertEngine(2, 0, "tcp/mh4:19111").
+                assertEngine(0, 1, "tcp/mh1:19111").
+                assertEngine(1, 1, "tcp/mh3:19111").
+                assertEngine(2, 1, "tcp/mh5:19111");
 
         List<Dispatch> ds = getDispatchers(tld);
         assertEquals(6, ds.size());