Merge pull request #3596 from vespa-engine/balder/remove-unused-rtcspec

Remove unused rtcspec.

12 files changed, 27 insertions, 112 deletions

diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2Handler.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2Handler.java
index 431fc797df6..eea085bd103 100644
--- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2Handler.java
+++ b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2Handler.java
@@ -3,8 +3,6 @@ package com.yahoo.vespa.clustercontroller.apps.clustercontroller;
 
 import com.google.inject.Inject;
 import com.yahoo.cloud.config.ClusterInfoConfig;
-import com.yahoo.cloud.config.ModelConfig;
-import com.yahoo.container.jdisc.config.HttpServerConfig;
 import com.yahoo.container.logging.AccessLog;
 import com.yahoo.log.LogLevel;
 import com.yahoo.vespa.clustercontroller.apputil.communication.http.JDiscHttpRequestHandler;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
index 6d4945f23ad..b4b89278c51 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
@@ -8,7 +8,15 @@ import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.defaults.Defaults;
 import com.yahoo.vespa.filedistribution.PathDoesNotExistException;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 
 import static com.yahoo.text.Lowercase.toLowerCase;
 
@@ -66,7 +74,7 @@ public abstract class AbstractService extends AbstractConfigProducer<AbstractCon
      * more key/value pairs to the service-list dump.
      * Supported key datatypes are String, and values may be String or Integer.
      */
-    private HashMap<String, Object> serviceProperties = new LinkedHashMap<>();
+    private Map<String, Object> serviceProperties = new LinkedHashMap<>();
 
     /** The affinity properties of this service. */
     private Optional<Affinity> affinity = Optional.empty();
@@ -522,15 +530,13 @@ public abstract class AbstractService extends AbstractConfigProducer<AbstractCon
      * The service HTTP port for health status
      * @return portnumber
      */
-    public int getHealthPort() {return -1;}
+    public int getHealthPort() { return -1;}
 
     /**
      * Overridden by subclasses. List of default dimensions to be added to this services metrics
      * @return The default dimensions for this service
      */
-    public HashMap<String, String> getDefaultMetricDimensions(){
-        return  new LinkedHashMap<>();
-    }
+    public HashMap<String, String> getDefaultMetricDimensions(){ return new LinkedHashMap<>(); }
 
     // For testing
     public int getNumPortsAllocated() {
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 66abf3e23cf..6fce100fdbc 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,8 +103,6 @@ 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");
         // Properties are set in DomSearchBuilder
         monitorService();
@@ -139,15 +137,6 @@ public class SearchNode extends AbstractService implements
     }
 
     /**
-     * Returns the connection spec string that resolves to this search node.
-     *
-     * @return The connection string.
-     */
-    public String getConnectSpec() {
-        return "tcp/" + getHost().getHostName() + ":" + getRpcPort();
-    }
-
-    /**
      * Returns the number of ports needed by this service.
      *
      * @return The number of ports.
@@ -166,19 +155,6 @@ public class SearchNode extends AbstractService implements
         return getRelativePort(0);
     }
 
-    protected int getSlimeMessagingPort() {
-        return getRelativePort(2);
-    }
-
-    /*
-     * 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();
@@ -258,8 +234,6 @@ public class SearchNode extends AbstractService implements
         builder.
             ptport(getDispatchPort()).
             rpcport(getRpcPort()).
-            slime_messaging_port(getSlimeMessagingPort()).
-            rtcspec(getConnectSpec()).
             httpport(getHttpPort()).
             partition(getNodeSpec().partitionId()).
             clustername(getClusterName()).
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/searchcore/src/vespa/searchcore/config/proton.def b/searchcore/src/vespa/searchcore/config/proton.def
index 58428a480bc..5471d94c541 100644
--- a/searchcore/src/vespa/searchcore/config/proton.def
+++ b/searchcore/src/vespa/searchcore/config/proton.def
@@ -11,12 +11,6 @@ ptport        int default=8003 restart
 ## Port to use for the rpcserver.
 rpcport       int default=8004 restart
 
-## Port used for Slime Message Passing (srmp protocol)
-slime_messaging_port int default=8005 restart
-
-## Connect spec for rtc.
-rtcspec       string default="tcp/localhost:8004" restart
-
 ## Port to use for the web server
 httpport       int default=0 restart