diff options
8 files changed, 14 insertions, 117 deletions
diff --git a/config-model/src/test/cfg/container/data/configserverinclude/hosted-vespa/hosted.xml b/config-model/src/test/cfg/container/data/configserverinclude/hosted-vespa/hosted.xml index dbe3bb659e0..fe4942d7c97 100644 --- a/config-model/src/test/cfg/container/data/configserverinclude/hosted-vespa/hosted.xml +++ b/config-model/src/test/cfg/container/data/configserverinclude/hosted-vespa/hosted.xml @@ -1,10 +1,3 @@ <!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <jdisc> - <config name="cloud.config.elk"> - <elasticsearch> - <item> - <host>foo</host> - </item> - </elasticsearch> - </config> </jdisc> diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt index 910c8da80ef..83e178bfa01 100644 --- a/configdefinitions/src/vespa/CMakeLists.txt +++ b/configdefinitions/src/vespa/CMakeLists.txt @@ -16,8 +16,6 @@ vespa_generate_config(configdefinitions configserver.def) install(FILES configserver.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(configdefinitions dispatch.def) install(FILES dispatch.def DESTINATION var/db/vespa/config_server/serverdb/classes) -vespa_generate_config(configdefinitions elk.def) -install(FILES elk.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(configdefinitions fleetcontroller.def) install(FILES fleetcontroller.def DESTINATION var/db/vespa/config_server/serverdb/classes) vespa_generate_config(configdefinitions ilscripts.def) diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelController.java b/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelController.java index f6b00440e30..4b94d4c21cc 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelController.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/SuperModelController.java @@ -23,8 +23,6 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import com.yahoo.cloud.config.ElkConfig; - /** * Controls the lifetime of the {@link SuperModel} and the {@link SuperModelRequestHandler}. * @@ -32,6 +30,7 @@ import com.yahoo.cloud.config.ElkConfig; * @since 5.9 */ public class SuperModelController implements RequestHandler { + private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(SuperModelController.class.getName()); private volatile SuperModelRequestHandler handler; private final GenerationCounter generationCounter; @@ -39,14 +38,12 @@ public class SuperModelController implements RequestHandler { private final long masterGeneration; private final ConfigDefinitionRepo configDefinitionRepo; private final ConfigResponseFactory responseFactory; - private final ElkConfig elkConfig; private volatile boolean enabled = false; - public SuperModelController(GenerationCounter generationCounter, ConfigDefinitionRepo configDefinitionRepo, ConfigserverConfig configserverConfig, ElkConfig elkConfig) { + public SuperModelController(GenerationCounter generationCounter, ConfigDefinitionRepo configDefinitionRepo, ConfigserverConfig configserverConfig) { this.generationCounter = generationCounter; this.configDefinitionRepo = configDefinitionRepo; - this.elkConfig = elkConfig; this.masterGeneration = configserverConfig.masterGeneration(); this.responseFactory = ConfigResponseFactoryFactory.createFactory(configserverConfig); this.zone = new Zone(configserverConfig); @@ -85,7 +82,7 @@ public class SuperModelController implements RequestHandler { private SuperModelRequestHandler createNewHandler(Map<TenantName, Map<ApplicationId, Application>> newModels) { long generation = generationCounter.get() + masterGeneration; - SuperModel model = new SuperModel(newModels, elkConfig, zone); + SuperModel model = new SuperModel(newModels, zone); return new SuperModelRequestHandler(model, configDefinitionRepo, generation, responseFactory); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModel.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModel.java index 2be7860b01f..1d34d4a0c00 100755 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModel.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModel.java @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.model; -import com.yahoo.cloud.config.ElkConfig; import com.yahoo.cloud.config.LbServicesConfig; import com.yahoo.cloud.config.RoutingConfig; import com.yahoo.config.ConfigInstance; @@ -22,19 +21,16 @@ import java.util.Map; * * @author vegardh * @since 5.9 - * */ -public class SuperModel implements LbServicesConfig.Producer, ElkConfig.Producer, RoutingConfig.Producer { +public class SuperModel implements LbServicesConfig.Producer, RoutingConfig.Producer { private final Map<TenantName, Map<ApplicationId, Application>> models; private final LbServicesProducer lbProd; - private final ElkProducer elkProd; private final RoutingProducer zoneProd; - public SuperModel(Map<TenantName, Map<ApplicationId, Application>> newModels, ElkConfig elkConfig, Zone zone) { + public SuperModel(Map<TenantName, Map<ApplicationId, Application>> newModels, Zone zone) { this.models = newModels; this.lbProd = new LbServicesProducer(Collections.unmodifiableMap(models), zone); - this.elkProd = new ElkProducer(elkConfig); this.zoneProd = new RoutingProducer(Collections.unmodifiableMap(models)); } @@ -44,10 +40,6 @@ public class SuperModel implements LbServicesConfig.Producer, ElkConfig.Producer LbServicesConfig.Builder builder = new LbServicesConfig.Builder(); getConfig(builder); return ConfigPayload.fromInstance(new LbServicesConfig(builder)); - } else if (configKey.equals(new ConfigKey<>(ElkConfig.class, configKey.getConfigId()))) { - ElkConfig.Builder builder = new ElkConfig.Builder(); - getConfig(builder); - return ConfigPayload.fromInstance(new ElkConfig(builder)); } else if (configKey.equals(new ConfigKey<>(RoutingConfig.class, configKey.getConfigId()))) { RoutingConfig.Builder builder = new RoutingConfig.Builder(); getConfig(builder); @@ -67,11 +59,6 @@ public class SuperModel implements LbServicesConfig.Producer, ElkConfig.Producer } @Override - public void getConfig(com.yahoo.cloud.config.ElkConfig.Builder builder) { - elkProd.getConfig(builder); - } - - @Override public void getConfig(RoutingConfig.Builder builder) { zoneProd.getConfig(builder); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java index a69cf547db0..68bdf3150ab 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java @@ -21,8 +21,6 @@ import java.io.File; import java.io.IOException; import java.util.Optional; -import com.yahoo.cloud.config.ElkConfig; - import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.*; @@ -43,8 +41,8 @@ public class SuperModelControllerTest { public void setup() throws IOException { counter = new SuperModelGenerationCounter(new MockCurator()); controller = new SuperModelController(counter, - new TestConfigDefinitionRepo(), new ConfigserverConfig(new ConfigserverConfig.Builder()), - new ElkConfig(new ElkConfig.Builder())); + new TestConfigDefinitionRepo(), + new ConfigserverConfig(new ConfigserverConfig.Builder())); } @Test @@ -94,11 +92,11 @@ public class SuperModelControllerTest { TenantName tenantA = TenantName.from("a"); long masterGen = 10; controller = new SuperModelController(counter, - new TestConfigDefinitionRepo(), new ConfigserverConfig(new ConfigserverConfig.Builder().masterGeneration(masterGen)), - new ElkConfig(new ElkConfig.Builder())); + new TestConfigDefinitionRepo(), + new ConfigserverConfig(new ConfigserverConfig.Builder().masterGeneration(masterGen))); long gen = counter.increment(); - controller.reloadConfig(tenantA, createApp(tenantA, "foo", 3l, 1)); + controller.reloadConfig(tenantA, createApp(tenantA, "foo", 3L, 1)); assertThat(controller.getHandler().getGeneration(), is(masterGen + gen)); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java index 93a48094fac..e5c839abb01 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelRequestHandlerTest.java @@ -2,20 +2,16 @@ package com.yahoo.vespa.config.server; import com.yahoo.cloud.config.LbServicesConfig; -import com.yahoo.cloud.config.ElkConfig; import com.yahoo.config.model.application.provider.FilesApplicationPackage; import com.yahoo.config.provision.*; import com.yahoo.jrt.Request; import com.yahoo.vespa.config.ConfigKey; -import com.yahoo.vespa.config.GetConfigRequest; import com.yahoo.cloud.config.LbServicesConfig.Tenants.Applications; import com.yahoo.vespa.config.protocol.CompressionType; -import com.yahoo.vespa.config.protocol.ConfigResponse; import com.yahoo.vespa.config.protocol.DefContent; import com.yahoo.vespa.config.protocol.JRTClientConfigRequestV3; import com.yahoo.vespa.config.protocol.JRTServerConfigRequestV3; import com.yahoo.vespa.config.protocol.Trace; -import com.yahoo.vespa.config.protocol.VespaVersion; import com.yahoo.vespa.config.server.application.Application; import com.yahoo.vespa.config.server.model.SuperModel; import com.yahoo.vespa.config.server.monitoring.MetricUpdater; @@ -32,9 +28,6 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Optional; -import com.yahoo.cloud.config.ElkConfig.Logstash; - -import com.yahoo.vespa.config.server.model.ElkProducer; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; @@ -55,33 +48,7 @@ public class SuperModelRequestHandlerTest { ApplicationId app = ApplicationId.from(TenantName.from("a"), ApplicationName.from("foo"), InstanceName.defaultName()); models.get(app.tenant()).put(app, new Application(new VespaModel(FilesApplicationPackage.fromFile(testApp)), new ServerCache(), 4l, Version.fromIntValues(1, 2, 3), MetricUpdater.createTestUpdater(), app)); - handler = new SuperModelRequestHandler(new SuperModel(models, new ElkConfig(new ElkConfig.Builder()), Zone.defaultZone()), new TestConfigDefinitionRepo(), 2, new UncompressedConfigResponseFactory()); - } - - @Test - public void test_super_model_resolve_elk() { - ConfigResponse response = handler.resolveConfig(new GetConfigRequest() { - @Override - public ConfigKey<?> getConfigKey() { - return new ConfigKey<>(ElkConfig.class, "dontcare"); - } - - @Override - public DefContent getDefContent() { - return DefContent.fromClass(ElkConfig.class); - } - - @Override - public Optional<VespaVersion> getVespaVersion() { - return Optional.empty(); - } - - @Override - public boolean noCache() { - return false; - } - }); - assertThat(response.getGeneration(), is(2l)); + handler = new SuperModelRequestHandler(new SuperModel(models, Zone.defaultZone()), new TestConfigDefinitionRepo(), 2, new UncompressedConfigResponseFactory()); } @Test @@ -124,7 +91,7 @@ public class SuperModelRequestHandlerTest { models.get(TenantName.from("t2")).put(applicationId("minetooadvancedapp"), new Application(new VespaModel(FilesApplicationPackage.fromFile(testApp3)), new ServerCache(), 4l, vespaVersion, MetricUpdater.createTestUpdater(), applicationId("minetooadvancedapp"))); - SuperModelRequestHandler han = new SuperModelRequestHandler(new SuperModel(models, new ElkConfig(new ElkConfig.Builder()), Zone.defaultZone()), new TestConfigDefinitionRepo(), 2, new UncompressedConfigResponseFactory()); + SuperModelRequestHandler han = new SuperModelRequestHandler(new SuperModel(models, Zone.defaultZone()), new TestConfigDefinitionRepo(), 2, new UncompressedConfigResponseFactory()); LbServicesConfig.Builder lb = new LbServicesConfig.Builder(); han.getSuperModel().getConfig(lb); LbServicesConfig lbc = new LbServicesConfig(lb); @@ -157,47 +124,7 @@ public class SuperModelRequestHandlerTest { org.junit.Assert.fail("No qrserver service in config"); } - @Test - public void testElkConfig() { - ElkConfig ec = new ElkConfig(new ElkConfig.Builder().elasticsearch(new ElkConfig.Elasticsearch.Builder().host("es1").port(99)). - logstash(new ElkConfig.Logstash.Builder(). - config_file("/cfgfile"). - source_field("srcfield"). - spool_size(345). - network(new Logstash.Network.Builder(). - servers(new Logstash.Network.Servers.Builder(). - host("ls1"). - port(999)). - servers(new Logstash.Network.Servers.Builder(). - host("ls2"). - port(998)). - timeout(78)). - files(new ElkConfig.Logstash.Files.Builder(). - paths("path1"). - paths("path2"). - fields("field1", "f1val"). - fields("field2", "f2val")))); - ElkProducer ep = new ElkProducer(ec); - ElkConfig.Builder newBuilder = new ElkConfig.Builder(); - ep.getConfig(newBuilder); - ElkConfig elkConfig = new ElkConfig(newBuilder); - assertThat(elkConfig.elasticsearch(0).host(), is("es1")); - assertThat(elkConfig.elasticsearch(0).port(), is(99)); - assertThat(elkConfig.logstash().network().servers(0).host(), is("ls1")); - assertThat(elkConfig.logstash().network().servers(0).port(), is(999)); - assertThat(elkConfig.logstash().network().servers(1).host(), is("ls2")); - assertThat(elkConfig.logstash().network().servers(1).port(), is(998)); - assertThat(elkConfig.logstash().network().timeout(), is(78)); - assertThat(elkConfig.logstash().config_file(), is("/cfgfile")); - assertThat(elkConfig.logstash().source_field(), is("srcfield")); - assertThat(elkConfig.logstash().spool_size(), is(345)); - assertThat(elkConfig.logstash().files().size(), is(1)); - assertThat(elkConfig.logstash().files(0).paths(0), is("path1")); - assertThat(elkConfig.logstash().files(0).paths(1), is("path2")); - assertThat(elkConfig.logstash().files(0).fields("field1"), is("f1val")); - assertThat(elkConfig.logstash().files(0).fields("field2"), is("f2val")); - } - } +} diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/TestWithRpc.java b/configserver/src/test/java/com/yahoo/vespa/config/server/TestWithRpc.java index 3e5431deccd..30143f565e5 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/TestWithRpc.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/TestWithRpc.java @@ -2,7 +2,6 @@ package com.yahoo.vespa.config.server; import com.yahoo.cloud.config.ConfigserverConfig; -import com.yahoo.cloud.config.ElkConfig; import com.yahoo.config.provision.TenantName; import com.yahoo.jrt.Request; import com.yahoo.jrt.Spec; @@ -65,7 +64,7 @@ public class TestWithRpc { protected void createAndStartRpcServer(boolean hostedVespa) { rpcServer = new RpcServer(new ConfigserverConfig(new ConfigserverConfig.Builder().rpcport(port).numthreads(1).maxgetconfigclients(1).hostedVespa(hostedVespa)), new SuperModelController(generationCounter, - new TestConfigDefinitionRepo(), new ConfigserverConfig(new ConfigserverConfig.Builder()), new ElkConfig(new ElkConfig.Builder())), + new TestConfigDefinitionRepo(), new ConfigserverConfig(new ConfigserverConfig.Builder())), Metrics.createTestMetrics(), new HostRegistries()); rpcServer.onTenantCreate(TenantName.from("default"), tenantProvider); t = new Thread(rpcServer); diff --git a/vespajlib/src/main/java/com/yahoo/net/LinuxInetAddress.java b/vespajlib/src/main/java/com/yahoo/net/LinuxInetAddress.java index 34a7a9b9c6e..5a1f6c249f2 100644 --- a/vespajlib/src/main/java/com/yahoo/net/LinuxInetAddress.java +++ b/vespajlib/src/main/java/com/yahoo/net/LinuxInetAddress.java @@ -20,8 +20,6 @@ import java.util.stream.Collectors; */ public class LinuxInetAddress { - private static Logger log = Logger.getLogger(LinuxInetAddress.class.getName()); - /** * Returns an InetAddress representing the address of the localhost. * A non-loopback address is preferred if available. |