Browse Source
Elastic have announced [1] that embedded Elasticsearch is no longer supported. This commit brings us into line with that announcement by removing the auto-configuration that would create an Elasticsearch Node and NodeClient. To use the Elasticsearch auto-configuration, a user must now provide the address of one or more cluster nodes (via the spring.elastisearch.cluster-nodes property) which will then be used to create a TransportClient. See gh-9374 [1] https://www.elastic.co/blog/elasticsearch-the-serverpull/9121/merge
Andy Wilkinson
9 years ago
13 changed files with 268 additions and 354 deletions
@ -0,0 +1,111 @@
@@ -0,0 +1,111 @@
|
||||
/* |
||||
* Copyright 2012-2017 the original author or authors. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package org.springframework.boot.autoconfigure.data.elasticsearch; |
||||
|
||||
import java.io.File; |
||||
import java.io.IOException; |
||||
import java.nio.file.Files; |
||||
import java.nio.file.Paths; |
||||
import java.util.Arrays; |
||||
import java.util.function.Consumer; |
||||
|
||||
import org.elasticsearch.common.settings.Settings; |
||||
import org.elasticsearch.node.InternalSettingsPreparer; |
||||
import org.elasticsearch.node.Node; |
||||
import org.elasticsearch.node.NodeValidationException; |
||||
import org.elasticsearch.transport.Netty4Plugin; |
||||
import org.elasticsearch.transport.Transport; |
||||
|
||||
/** |
||||
* Helper class for managing an Elasticsearch {@link Node}. |
||||
* |
||||
* @author Andy Wilkinson |
||||
*/ |
||||
public class ElasticsearchNodeTemplate { |
||||
|
||||
public void doWithNode(Consumer<ElasticsearchNode> consumer) { |
||||
System.setProperty("es.set.netty.runtime.available.processors", "false"); |
||||
Node node = null; |
||||
try { |
||||
node = startNode(); |
||||
consumer.accept(new ElasticsearchNode(node)); |
||||
} |
||||
catch (Exception ex) { |
||||
throw new RuntimeException(ex); |
||||
} |
||||
finally { |
||||
if (node != null) { |
||||
try { |
||||
node.close(); |
||||
} |
||||
catch (Exception ex) { |
||||
// Continue
|
||||
} |
||||
} |
||||
System.clearProperty("es.set.netty.runtime.available.processors"); |
||||
} |
||||
} |
||||
|
||||
private Node startNode() throws NodeValidationException { |
||||
Node node = new NettyTransportNode(); |
||||
node.start(); |
||||
return node; |
||||
} |
||||
|
||||
private static final class NettyTransportNode extends Node { |
||||
|
||||
private NettyTransportNode() { |
||||
super(InternalSettingsPreparer.prepareEnvironment(Settings.builder() |
||||
.put("path.home", "target/es/node").put("transport.type", "netty4") |
||||
.put("http.enabled", true).put("node.portsfile", true) |
||||
.put("http.port", 0).put("transport.tcp.port", 0).build(), null), |
||||
Arrays.asList(Netty4Plugin.class)); |
||||
new File("target/es/node/logs").mkdirs(); |
||||
} |
||||
} |
||||
|
||||
public final class ElasticsearchNode { |
||||
|
||||
private final Node node; |
||||
|
||||
private ElasticsearchNode(Node node) { |
||||
this.node = node; |
||||
} |
||||
|
||||
public int getTcpPort() { |
||||
return this.node.injector().getInstance(Transport.class).boundAddress() |
||||
.publishAddress().getPort(); |
||||
} |
||||
|
||||
public int getHttpPort() { |
||||
try { |
||||
for (String line : Files |
||||
.readAllLines(Paths.get("target/es/node/logs/http.ports"))) { |
||||
if (line.startsWith("127.0.0.1")) { |
||||
return Integer.parseInt(line.substring(line.indexOf(":") + 1)); |
||||
} |
||||
} |
||||
throw new IllegalStateException("HTTP port not found"); |
||||
} |
||||
catch (IOException ex) { |
||||
throw new IllegalStateException("Failed to read HTTP port", ex); |
||||
} |
||||
} |
||||
|
||||
} |
||||
|
||||
} |
||||
@ -1,6 +1 @@
@@ -1,6 +1 @@
|
||||
# |
||||
# Home directory of the embedded Elasticsearch instance. Default to the |
||||
# current working directory. |
||||
# |
||||
spring.data.elasticsearch.properties.path.home=target/elastic |
||||
spring.data.elasticsearch.properties.transport.tcp.connect_timeout=120s |
||||
spring.data.elasticsearch.cluster-nodes=localhost:9200 |
||||
|
||||
Loading…
Reference in new issue