From d3ed4281bec0606b28bc70911faab91b96f93db5 Mon Sep 17 00:00:00 2001
From: Phaneesh <phaneesh.n@gmail.com>
Date: Tue, 18 Dec 2012 12:08:08 +0530
Subject: [PATCH] Adding TransportCLient support for connecting to remote
elasticsearch cluster
---
.../yahoo/ycsb/db/ElasticSearchClient.java | 42 ++++++++++++++++---
1 file changed, 36 insertions(+), 6 deletions(-)
diff --git a/elasticsearch/src/main/java/com/yahoo/ycsb/db/ElasticSearchClient.java b/elasticsearch/src/main/java/com/yahoo/ycsb/db/ElasticSearchClient.java
index aff2a81d..30349bb3 100644
--- a/elasticsearch/src/main/java/com/yahoo/ycsb/db/ElasticSearchClient.java
+++ b/elasticsearch/src/main/java/com/yahoo/ycsb/db/ElasticSearchClient.java
@@ -14,7 +14,10 @@ import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.Requests;
import static org.elasticsearch.common.settings.ImmutableSettings.*;
+
+import org.elasticsearch.client.transport.TransportClient;
import org.elasticsearch.common.settings.ImmutableSettings.Builder;
+import org.elasticsearch.common.transport.InetSocketTransportAddress;
import org.elasticsearch.common.xcontent.XContentBuilder;
import static org.elasticsearch.common.xcontent.XContentFactory.*;
import static org.elasticsearch.index.query.FilterBuilders.*;
@@ -37,10 +40,13 @@ public class ElasticSearchClient extends DB {
public static final String DEFAULT_CLUSTER_NAME = "es.ycsb.cluster";
public static final String DEFAULT_INDEX_KEY = "es.ycsb";
+ public static final String DEFAULT_REMOTE_HOST = "localhost:9300";
private Node node;
private Client client;
private String indexKey;
+ private Boolean remoteMode;
+
/**
* Initialize any state for this DB. Called once per DB instance; there is
* one DB instance per client thread.
@@ -51,6 +57,8 @@ public class ElasticSearchClient extends DB {
Properties props = getProperties();
this.indexKey = props.getProperty("es.index.key", DEFAULT_INDEX_KEY);
String clusterName = props.getProperty("cluster.name", DEFAULT_CLUSTER_NAME);
+ //Check if transport client needs to be used (To connect to multiple elasticsearch nodes)
+ remoteMode = Boolean.parseBoolean(props.getProperty("elasticsearch.remote", "false"));
Boolean newdb = Boolean.parseBoolean(props.getProperty("elasticsearch.newdb", "false"));
Builder settings = settingsBuilder()
.put("node.local", "true")
@@ -68,10 +76,28 @@ public class ElasticSearchClient extends DB {
settings.put(props);
System.out.println("ElasticSearch starting node = " + settings.get("cluster.name"));
System.out.println("ElasticSearch node data path = " + settings.get("path.data"));
+ System.out.println("ElasticSearch Remote Mode = " +remoteMode);
+ //Remote mode support for connecting to remote elasticsearch cluster
+ if(remoteMode) {
+ settings.put("client.transport.sniff", true)
+ .put("client.transport.ignore_cluster_name", false)
+ .put("client.transport.ping_timeout", "30s")
+ .put("client.transport.nodes_sampler_interval", "30s");
+ //Default it to localhost:9300
+ String nodeList[] = props.getProperty("elasticsearch.hosts.list", DEFAULT_REMOTE_HOST).split(",");
+ System.out.println("ElasticSearch Remote Hosts = " +props.getProperty("elasticsearch.hosts.list", DEFAULT_REMOTE_HOST));
+ TransportClient tClient = new TransportClient(settings);
+ for(String h : nodeList) {
+ String node[] = h.split(":");
+ tClient.addTransportAddress(new InetSocketTransportAddress(node[0], Integer.parseInt(node[1])));
+ }
+ client = tClient;
+ } else { //Start node only if transport client mode is disabled
+ node = nodeBuilder().clusterName(clusterName).settings(settings).node();
+ node.start();
+ client = node.client();
+ }
- node = nodeBuilder().clusterName(clusterName).settings(settings).node();
- node.start();
- client = node.client();
if (newdb) {
client.admin().indices().prepareDelete(indexKey).execute().actionGet();
@@ -86,10 +112,14 @@ public class ElasticSearchClient extends DB {
@Override
public void cleanup() throws DBException {
- if (!node.isClosed()) {
+ if(!remoteMode) {
+ if (!node.isClosed()) {
+ client.close();
+ node.stop();
+ node.close();
+ }
+ } else {
client.close();
- node.stop();
- node.close();
}
}
--
GitLab