diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-12-02 06:20:33 -0800 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-12-02 06:20:33 -0800 |
commit | 4d45743e389a03777ad5120745740cf2a7327efd (patch) | |
tree | 6e1c7650f90cada1a209388bb548130df3cb18a4 /config-model | |
parent | 3d7da2d3d5d93231fa0351a6b716f9dea7ba2b81 (diff) |
Revert "Merge pull request #7837 from vespa-engine/revert-7836-bratseth/remove-unused-rpc-server-take-3"
This reverts commit 0c39992b60e6103a85fa00362df74930a660e51c, reversing
changes made to a8277a3a486f7fd174e562bf174cfa72aede9cee.
Diffstat (limited to 'config-model')
5 files changed, 1 insertions, 16 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java index 5698485b004..c07d6f66237 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java @@ -116,7 +116,6 @@ public class DomAdminV4Builder extends DomAdminBuilderBase { // Add base handlers and the log handler logServerCluster.addMetricStateHandler(); logServerCluster.addApplicationStatusHandler(); - logServerCluster.addStatisticsHandler(); logServerCluster.addDefaultRootHandler(); logServerCluster.addVipHandler(); addLogHandler(logServerCluster); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java index 12613018ca7..3d5f9dcfb59 100755 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java @@ -216,7 +216,7 @@ public final class ContainerCluster addComponent(new StatisticsComponent()); addSimpleComponent(AccessLog.class); - // TODO better modelling + // TODO: Better modelling addSimpleComponent(ThreadPoolProvider.class); addSimpleComponent(com.yahoo.concurrent.classlock.ClassLocking.class); addSimpleComponent("com.yahoo.jdisc.http.filter.SecurityFilterInvoker"); @@ -232,7 +232,6 @@ public final class ContainerCluster addSimpleComponent("com.yahoo.container.jdisc.state.StateMonitor"); addSimpleComponent("com.yahoo.container.jdisc.ContainerThreadFactory"); addSimpleComponent("com.yahoo.container.protect.FreezeDetector"); - addSimpleComponent("com.yahoo.container.core.slobrok.SlobrokConfigurator"); addSimpleComponent("com.yahoo.container.handler.VipStatus"); addSimpleComponent(com.yahoo.container.handler.ClustersStatus.class.getName()); addJaxProviders(); @@ -289,12 +288,6 @@ public final class ContainerCluster addComponent(vipHandler); } - public void addStatisticsHandler() { - Handler<?> statsHandler = Handler.fromClassName(STATISTICS_HANDLER_CLASS); - statsHandler.addServerBindings("http://*/statistics/*", "https://*/statistics/*"); - addComponent(statsHandler); - } - @SuppressWarnings("deprecation") private void addJaxProviders() { addSimpleComponent(com.yahoo.container.xml.providers.DatatypeFactoryProvider.class); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index 0be25808541..b5c1b1e1496 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -289,7 +289,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { cluster.addDefaultRootHandler(); cluster.addMetricStateHandler(); cluster.addApplicationStatusHandler(); - cluster.addStatisticsHandler(); } private void addClientProviders(DeployState deployState, Element spec, ContainerCluster cluster) { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java index 8158db51271..49a989a9474 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java @@ -104,7 +104,6 @@ public class ContainerDocumentApiBuilderTest extends ContainerModelBuilderTestBa Map<String, Handler<?>> handlerMap = getHandlers("cluster1"); - assertThat(handlerMap.get("com.yahoo.container.config.StatisticsRequestHandler"), not(nullValue())); assertThat(handlerMap.get("com.yahoo.container.handler.VipStatusHandler"), not(nullValue())); assertThat(handlerMap.get("com.yahoo.container.handler.observability.ApplicationStatusHandler"), not(nullValue())); assertThat(handlerMap.get("com.yahoo.container.jdisc.state.StateHandler"), not(nullValue())); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java index aa1ac401014..0030392f318 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java @@ -18,7 +18,6 @@ import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.Zone; import com.yahoo.container.ComponentsConfig; import com.yahoo.container.QrConfig; -import com.yahoo.container.config.StatisticsRequestHandler; import com.yahoo.container.core.ChainsConfig; import com.yahoo.container.core.VipStatusConfig; import com.yahoo.container.handler.VipStatusHandler; @@ -275,10 +274,6 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { assertThat(applicationStatusHandler.serverBindings(), contains("http://*/ApplicationStatus", "https://*/ApplicationStatus")); - JdiscBindingsConfig.Handlers statisticsRequestHandler = config.handlers(StatisticsRequestHandler.class.getName()); - assertTrue(statisticsRequestHandler.serverBindings(0).startsWith("http://*/statistics")); - assertTrue(statisticsRequestHandler.serverBindings(1).startsWith("https://*/statistics")); - JdiscBindingsConfig.Handlers fileRequestHandler = config.handlers(VipStatusHandler.class.getName()); assertThat(fileRequestHandler.serverBindings(), contains("http://*/status.html", "https://*/status.html")); |