update to Elasticsearch 5.2.2
This commit is contained in:
parent
6f6dd8ae08
commit
f181871948
3 changed files with 35 additions and 21 deletions
14
build.gradle
14
build.gradle
|
|
@ -57,19 +57,19 @@ configurations {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.xbib:metrics:1.0.0"
|
||||
compile("org.elasticsearch.client:transport:5.1.1") {
|
||||
compile("org.elasticsearch.client:transport:${project.property('elasticsearch-client-transport.version')}") {
|
||||
exclude group: 'org.elasticsearch', module: 'securesm'
|
||||
exclude group: 'org.elasticsearch.plugin', module: 'transport-netty3-client'
|
||||
exclude group: 'org.elasticsearch.plugin', module: 'reindex-client'
|
||||
exclude group: 'org.elasticsearch.plugin', module: 'percolator-client'
|
||||
exclude group: 'org.elasticsearch.plugin', module: 'lang-mustache-client'
|
||||
}
|
||||
compile "io.netty:netty-transport-native-epoll:4.1.6.Final:linux-x86_64"
|
||||
compile "org.apache.logging.log4j:log4j-api:2.7"
|
||||
testCompile "junit:junit:4.12"
|
||||
testCompile "org.apache.logging.log4j:log4j-core:2.7"
|
||||
wagon 'org.apache.maven.wagon:wagon-ssh-external:2.10'
|
||||
compile "org.xbib:metrics:${project.property('xbib-metrics.version')}"
|
||||
compile "io.netty:netty-transport-native-epoll:${project.property('netty-transport-native-epoll.version')}:linux-x86_64"
|
||||
compile "org.apache.logging.log4j:log4j-api:${project.property('log4j.version')}"
|
||||
testCompile "junit:junit:${project.property('junit.version')}"
|
||||
testCompile "org.apache.logging.log4j:log4j-core:${project.property('log4j.version')}"
|
||||
wagon "org.apache.maven.wagon:wagon-ssh-external:${project.property('wagon.version')}"
|
||||
}
|
||||
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
group = org.xbib
|
||||
name = elasticsearch-extras-client
|
||||
version = 5.1.1.0
|
||||
version = 5.2.2.0
|
||||
|
||||
elasticsearch-client-transport.version = 5.2.2
|
||||
xbib-metrics.version = 1.0.0
|
||||
netty-transport-native-epoll.version = 4.1.6.Final
|
||||
log4j.version = 2.8
|
||||
junit.version = 4.12
|
||||
wagon.version = 2.10
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package org.xbib.elasticsearch.extras.client.transport;
|
||||
|
||||
import static java.util.stream.Collectors.toList;
|
||||
import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
|
|
@ -36,6 +37,7 @@ import org.elasticsearch.common.settings.SettingsModule;
|
|||
import org.elasticsearch.common.transport.InetSocketTransportAddress;
|
||||
import org.elasticsearch.common.transport.TransportAddress;
|
||||
import org.elasticsearch.common.util.BigArrays;
|
||||
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
|
||||
import org.elasticsearch.indices.breaker.CircuitBreakerService;
|
||||
import org.elasticsearch.node.Node;
|
||||
import org.elasticsearch.node.internal.InternalSettingsPreparer;
|
||||
|
|
@ -64,7 +66,8 @@ import java.util.Map;
|
|||
import java.util.Set;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
/**
|
||||
* Stripped-down transport client without node sampling and without retrying.
|
||||
|
|
@ -301,10 +304,10 @@ public class TransportClient extends AbstractClient {
|
|||
for (DiscoveryNode listedNode : listedNodes) {
|
||||
if (!transportService.nodeConnected(listedNode)) {
|
||||
try {
|
||||
logger.debug("connecting to listed node (light) [{}]", listedNode);
|
||||
transportService.connectToNodeLight(listedNode);
|
||||
logger.debug("connecting to listed node [{}]", listedNode);
|
||||
transportService.connectToNode(listedNode);
|
||||
} catch (Exception e) {
|
||||
logger.debug("failed to connect to node [{}], removed from nodes list", e, listedNode);
|
||||
logger.debug("failed to connect to node [{}]", e);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
|
@ -346,7 +349,7 @@ public class TransportClient extends AbstractClient {
|
|||
transportService.connectToNode(node);
|
||||
} catch (Exception e) {
|
||||
it.remove();
|
||||
logger.debug("failed to connect to discovered node [" + node + "]", e);
|
||||
logger.debug("failed to connect to new node [" + node + "], removed", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -435,20 +438,23 @@ public class TransportClient extends AbstractClient {
|
|||
entries.addAll(searchModule.getNamedWriteables());
|
||||
entries.addAll(pluginsService.filterPlugins(Plugin.class).stream()
|
||||
.flatMap(p -> p.getNamedWriteables().stream())
|
||||
.collect(Collectors.toList()));
|
||||
.collect(toList()));
|
||||
NamedWriteableRegistry namedWriteableRegistry = new NamedWriteableRegistry(entries);
|
||||
|
||||
NamedXContentRegistry xContentRegistry = new NamedXContentRegistry(Stream.of(
|
||||
searchModule.getNamedXContents().stream(),
|
||||
pluginsService.filterPlugins(Plugin.class).stream()
|
||||
.flatMap(p -> p.getNamedXContent().stream())
|
||||
).flatMap(Function.identity()).collect(toList()));
|
||||
ModulesBuilder modules = new ModulesBuilder();
|
||||
// plugin modules must be added here, before others or we can get crazy injection errors
|
||||
for (Module pluginModule : pluginsService.createGuiceModules()) {
|
||||
modules.add(pluginModule);
|
||||
}
|
||||
modules.add(b -> b.bind(ThreadPool.class).toInstance(threadPool));
|
||||
ActionModule actionModule = new ActionModule(false, true,
|
||||
settings, null, settingsModule.getClusterSettings(),
|
||||
ActionModule actionModule = new ActionModule(true, settings, null,
|
||||
settingsModule.getClusterSettings(), threadPool,
|
||||
pluginsService.filterPlugins(ActionPlugin.class));
|
||||
modules.add(actionModule);
|
||||
|
||||
CircuitBreakerService circuitBreakerService = Node.createCircuitBreakerService(settingsModule.getSettings(),
|
||||
settingsModule.getClusterSettings());
|
||||
BigArrays bigArrays = new BigArrays(settings, circuitBreakerService);
|
||||
|
|
@ -457,7 +463,8 @@ public class TransportClient extends AbstractClient {
|
|||
modules.add(settingsModule);
|
||||
NetworkModule networkModule = new NetworkModule(settings, true,
|
||||
pluginsService.filterPlugins(NetworkPlugin.class), threadPool,
|
||||
bigArrays, circuitBreakerService, namedWriteableRegistry, networkService);
|
||||
bigArrays, circuitBreakerService, namedWriteableRegistry,
|
||||
xContentRegistry, networkService);
|
||||
final Transport transport = networkModule.getTransportSupplier().get();
|
||||
final TransportService transportService = new TransportService(settings, transport, threadPool,
|
||||
networkModule.getTransportInterceptor(), null);
|
||||
|
|
@ -473,10 +480,10 @@ public class TransportClient extends AbstractClient {
|
|||
Injector injector = modules.createInjector();
|
||||
final ProxyActionMap proxy = new ProxyActionMap(settings, transportService,
|
||||
actionModule.getActions().values().stream()
|
||||
.map(ActionPlugin.ActionHandler::getAction).collect(Collectors.toList()));
|
||||
.map(ActionPlugin.ActionHandler::getAction).collect(toList()));
|
||||
List<LifecycleComponent> pluginLifecycleComponents = new ArrayList<>();
|
||||
pluginLifecycleComponents.addAll(pluginsService.getGuiceServiceClasses().stream()
|
||||
.map(injector::getInstance).collect(Collectors.toList()));
|
||||
.map(injector::getInstance).collect(toList()));
|
||||
resourcesToClose.addAll(pluginLifecycleComponents);
|
||||
transportService.start();
|
||||
transportService.acceptIncomingRequests();
|
||||
|
|
|
|||
Loading…
Reference in a new issue