You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/07/13 09:05:33 UTC
karaf-decanter git commit: [KARAF-3848] Support loading of
etc/elasticsearch.yml
Repository: karaf-decanter
Updated Branches:
refs/heads/master 12a0d9182 -> 2863013cc
[KARAF-3848] Support loading of etc/elasticsearch.yml
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/2863013c
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/2863013c
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/2863013c
Branch: refs/heads/master
Commit: 2863013ccebd168f0b49acd19fab34ee8d7f5f5a
Parents: 12a0d91
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Jul 13 09:04:23 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Jul 13 09:04:23 2015 +0200
----------------------------------------------------------------------
assembly/src/main/feature/feature.xml | 1 +
elasticsearch/pom.xml | 24 ++
elasticsearch/src/main/cfg/elasticsearch.yml | 371 +++++++++++++++++++
.../decanter/elasticsearch/EmbeddedNode.java | 45 ++-
.../elasticsearch/TestEmbeddedNode.java | 5 +-
5 files changed, 428 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/2863013c/assembly/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/feature/feature.xml b/assembly/src/main/feature/feature.xml
index bb129f9..19386bd 100644
--- a/assembly/src/main/feature/feature.xml
+++ b/assembly/src/main/feature/feature.xml
@@ -66,6 +66,7 @@
</feature>
<feature name="elasticsearch" version="${elasticsearch.version}" description="Embedded Elasticsearch node">
+ <configfile finalname="/etc/elasticsearch.yml">mvn:org.apache.karaf.decanter/org.apache.karaf.decanter.elasticsearch/${project.version}/yml</configfile>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.elasticsearch/${elasticsearch.bundle.version}</bundle>
<bundle>mvn:org.apache.karaf.decanter/org.apache.karaf.decanter.elasticsearch/${project.version}</bundle>
</feature>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/2863013c/elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
index eb01717..a650ced 100644
--- a/elasticsearch/pom.xml
+++ b/elasticsearch/pom.xml
@@ -60,6 +60,10 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
@@ -88,6 +92,26 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>src/main/cfg/elasticsearch.yml</file>
+ <type>yml</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/2863013c/elasticsearch/src/main/cfg/elasticsearch.yml
----------------------------------------------------------------------
diff --git a/elasticsearch/src/main/cfg/elasticsearch.yml b/elasticsearch/src/main/cfg/elasticsearch.yml
new file mode 100644
index 0000000..589c76e
--- /dev/null
+++ b/elasticsearch/src/main/cfg/elasticsearch.yml
@@ -0,0 +1,371 @@
+###############################################################################
+##################### Elasticsearch Decanter Configuration ####################
+###############################################################################
+
+# WARNING: change in this configuration file requires a refresh or restart of
+# the elasticsearch bundle
+
+################################### Cluster ###################################
+
+# Cluster name identifies your cluster for auto-discovery. If you're running
+# multiple clusters on the same network, make sure you're using unique names.
+#
+cluster.name: elasticsearch
+cluster.routing.schedule: 50ms
+
+
+#################################### Node #####################################
+
+# Node names are generated dynamically on startup, so you're relieved
+# from configuring them manually. You can tie this node to a specific name:
+#
+node.name: decanter
+
+# Every node can be configured to allow or deny being eligible as the master,
+# and to allow or deny to store the data.
+#
+# Allow this node to be eligible as a master node (enabled by default):
+#
+#node.master: true
+#
+# Allow this node to store data (enabled by default):
+#
+node.data: true
+
+# You can exploit these settings to design advanced cluster topologies.
+#
+# 1. You want this node to never become a master node, only to hold data.
+# This will be the "workhorse" of your cluster.
+#
+#node.master: false
+#node.data: true
+#
+# 2. You want this node to only serve as a master: to not store any data and
+# to have free resources. This will be the "coordinator" of your cluster.
+#
+#node.master: true
+#node.data: false
+#
+# 3. You want this node to be neither master nor data node, but
+# to act as a "search load balancer" (fetching data from nodes,
+# aggregating results, etc.)
+#
+#node.master: false
+#node.data: false
+
+# Use the Cluster Health API [http://localhost:9200/_cluster/health], the
+# Node Info API [http://localhost:9200/_nodes] or GUI tools
+# such as <http://www.elasticsearch.org/overview/marvel/>,
+# <http://github.com/karmi/elasticsearch-paramedic>,
+# <http://github.com/lukas-vlcek/bigdesk> and
+# <http://mobz.github.com/elasticsearch-head> to inspect the cluster state.
+
+# A node can have generic attributes associated with it, which can later be used
+# for customized shard allocation filtering, or allocation awareness. An attribute
+# is a simple key value pair, similar to node.key: value, here is an example:
+#
+#node.rack: rack314
+
+# By default, multiple nodes are allowed to start from the same installation location
+# to disable it, set the following:
+#node.max_local_storage_nodes: 1
+
+
+#################################### Index ####################################
+
+# You can set a number of options (such as shard/replica options, mapping
+# or analyzer definitions, translog settings, ...) for indices globally,
+# in this file.
+#
+# Note, that it makes more sense to configure index settings specifically for
+# a certain index, either when creating it or by using the index templates API.
+#
+# See <http://elasticsearch.org/guide/en/elasticsearch/reference/current/index-modules.html> and
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/indices-create-index.html>
+# for more information.
+
+# Set the number of shards (splits) of an index (5 by default):
+#
+#index.number_of_shards: 5
+
+# Set the number of replicas (additional copies) of an index (1 by default):
+#
+#index.number_of_replicas: 1
+
+# Note, that for development on a local machine, with small indices, it usually
+# makes sense to "disable" the distributed features:
+#
+#index.number_of_shards: 1
+#index.number_of_replicas: 0
+
+# These settings directly affect the performance of index and search operations
+# in your cluster. Assuming you have enough machines to hold shards and
+# replicas, the rule of thumb is:
+#
+# 1. Having more *shards* enhances the _indexing_ performance and allows to
+# _distribute_ a big index across machines.
+# 2. Having more *replicas* enhances the _search_ performance and improves the
+# cluster _availability_.
+#
+# The "number_of_shards" is a one-time setting for an index.
+#
+# The "number_of_replicas" can be increased or decreased anytime,
+# by using the Index Update Settings API.
+#
+# Elasticsearch takes care about load balancing, relocating, gathering the
+# results from nodes, etc. Experiment with different settings to fine-tune
+# your setup.
+
+# Use the Index Status API (<http://localhost:9200/A/_status>) to inspect
+# the index status.
+
+
+#################################### Paths ####################################
+
+# Path to directory containing configuration (this file and logging.yml):
+#
+#path.conf: /path/to/conf
+
+# Path to directory where to store index data allocated for this node.
+#
+#path.data: /path/to/data
+#
+# Can optionally include more than one location, causing data to be striped across
+# the locations (a la RAID 0) on a file level, favouring locations with most free
+# space on creation. For example:
+#
+#path.data: /path/to/data1,/path/to/data2
+path.data: data
+
+# Path to temporary files:
+#
+#path.work: /path/to/work
+
+# Path to log files:
+#
+#path.logs: /path/to/logs
+
+# Path to where plugins are installed:
+#
+#path.plugins: /path/to/plugins
+path.plugins: ${karaf.home}/elasticsearch/plugins
+
+#################################### Plugin ###################################
+
+# If a plugin listed here is not installed for current node, the node will not start.
+#
+#plugin.mandatory: mapper-attachments,lang-groovy
+
+
+################################### Memory ####################################
+
+# Elasticsearch performs poorly when JVM starts swapping: you should ensure that
+# it _never_ swaps.
+#
+# Set this property to true to lock the memory:
+#
+#bootstrap.mlockall: true
+
+# Make sure that the ES_MIN_MEM and ES_MAX_MEM environment variables are set
+# to the same value, and that the machine has enough memory to allocate
+# for Elasticsearch, leaving enough memory for the operating system itself.
+#
+# You should also make sure that the Elasticsearch process is allowed to lock
+# the memory, eg. by using `ulimit -l unlimited`.
+
+
+############################## Network And HTTP ###############################
+
+# Elasticsearch, by default, binds itself to the 0.0.0.0 address, and listens
+# on port [9200-9300] for HTTP traffic and on port [9300-9400] for node-to-node
+# communication. (the range means that if the port is busy, it will automatically
+# try the next port).
+
+# Set the bind address specifically (IPv4 or IPv6):
+#
+#network.bind_host: 192.168.0.1
+
+# Set the address other nodes will use to communicate with this node. If not
+# set, it is automatically derived. It must point to an actual IP address.
+#
+#network.publish_host: 192.168.0.1
+
+# Set both 'bind_host' and 'publish_host':
+#
+#network.host: 192.168.0.1
+network.host: 127.0.0.1
+
+# Set a custom port for the node to node communication (9300 by default):
+#
+#transport.tcp.port: 9300
+
+# Enable compression for all communication between nodes (disabled by default):
+#
+#transport.tcp.compress: true
+
+# Set a custom port to listen for HTTP traffic:
+#
+#http.port: 9200
+
+# Set a custom allowed content length:
+#
+#http.max_content_length: 100mb
+
+# Enable HTTP:
+#
+http.enabled: true
+http.cors.enabled: true
+http.cors.allow-origin: /.*/
+
+
+################################### Gateway ###################################
+
+# The gateway allows for persisting the cluster state between full cluster
+# restarts. Every change to the state (such as adding an index) will be stored
+# in the gateway, and when the cluster starts up for the first time,
+# it will read its state from the gateway.
+
+# There are several types of gateway implementations. For more information, see
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-gateway.html>.
+
+# The default gateway type is the "local" gateway (recommended):
+#
+#gateway.type: local
+
+# Settings below control how and when to start the initial recovery process on
+# a full cluster restart (to reuse as much local data as possible when using shared
+# gateway).
+
+# Allow recovery process after N nodes in a cluster are up:
+#
+#gateway.recover_after_nodes: 1
+
+# Set the timeout to initiate the recovery process, once the N nodes
+# from previous setting are up (accepts time value):
+#
+#gateway.recover_after_time: 5m
+
+# Set how many nodes are expected in this cluster. Once these N nodes
+# are up (and recover_after_nodes is met), begin recovery process immediately
+# (without waiting for recover_after_time to expire):
+#
+#gateway.expected_nodes: 2
+
+
+############################# Recovery Throttling #############################
+
+# These settings allow to control the process of shards allocation between
+# nodes during initial recovery, replica allocation, rebalancing,
+# or when adding and removing nodes.
+
+# Set the number of concurrent recoveries happening on a node:
+#
+# 1. During the initial recovery
+#
+#cluster.routing.allocation.node_initial_primaries_recoveries: 4
+#
+# 2. During adding/removing nodes, rebalancing, etc
+#
+#cluster.routing.allocation.node_concurrent_recoveries: 2
+
+# Set to throttle throughput when recovering (eg. 100mb, by default 20mb):
+#
+#indices.recovery.max_bytes_per_sec: 20mb
+
+# Set to limit the number of open concurrent streams when
+# recovering a shard from a peer:
+#
+#indices.recovery.concurrent_streams: 5
+
+
+################################## Discovery ##################################
+
+# Discovery infrastructure ensures nodes can be found within a cluster
+# and master node is elected. Multicast discovery is the default.
+
+# Set to ensure a node sees N other master eligible nodes to be considered
+# operational within the cluster. This should be set to a quorum/majority of
+# the master-eligible nodes in the cluster.
+#
+#discovery.zen.minimum_master_nodes: 1
+
+# Set the time to wait for ping responses from other nodes when discovering.
+# Set this option to a higher value on a slow or congested network
+# to minimize discovery failures:
+#
+#discovery.zen.ping.timeout: 3s
+
+# For more information, see
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-discovery-zen.html>
+
+# Unicast discovery allows to explicitly control which nodes will be used
+# to discover the cluster. It can be used when multicast is not present,
+# or to restrict the cluster communication-wise.
+#
+# 1. Disable multicast discovery (enabled by default):
+#
+#discovery.zen.ping.multicast.enabled: false
+#
+# 2. Configure an initial list of master nodes in the cluster
+# to perform discovery when new nodes (master or data) are started:
+#
+#discovery.zen.ping.unicast.hosts: ["host1", "host2:port"]
+
+# EC2 discovery allows to use AWS EC2 API in order to perform discovery.
+#
+# You have to install the cloud-aws plugin for enabling the EC2 discovery.
+#
+# For more information, see
+# <http://elasticsearch.org/guide/en/elasticsearch/reference/current/modules-discovery-ec2.html>
+#
+# See <http://elasticsearch.org/tutorials/elasticsearch-on-ec2/>
+# for a step-by-step tutorial.
+
+# GCE discovery allows to use Google Compute Engine API in order to perform discovery.
+#
+# You have to install the cloud-gce plugin for enabling the GCE discovery.
+#
+# For more information, see <https://github.com/elasticsearch/elasticsearch-cloud-gce>.
+
+# Azure discovery allows to use Azure API in order to perform discovery.
+#
+# You have to install the cloud-azure plugin for enabling the Azure discovery.
+#
+# For more information, see <https://github.com/elasticsearch/elasticsearch-cloud-azure>.
+
+################################## Slow Log ##################################
+
+# Shard level query and fetch threshold logging.
+
+#index.search.slowlog.threshold.query.warn: 10s
+#index.search.slowlog.threshold.query.info: 5s
+#index.search.slowlog.threshold.query.debug: 2s
+#index.search.slowlog.threshold.query.trace: 500ms
+
+#index.search.slowlog.threshold.fetch.warn: 1s
+#index.search.slowlog.threshold.fetch.info: 800ms
+#index.search.slowlog.threshold.fetch.debug: 500ms
+#index.search.slowlog.threshold.fetch.trace: 200ms
+
+#index.indexing.slowlog.threshold.index.warn: 10s
+#index.indexing.slowlog.threshold.index.info: 5s
+#index.indexing.slowlog.threshold.index.debug: 2s
+#index.indexing.slowlog.threshold.index.trace: 500ms
+
+################################## GC Logging ################################
+
+#monitor.jvm.gc.young.warn: 1000ms
+#monitor.jvm.gc.young.info: 700ms
+#monitor.jvm.gc.young.debug: 400ms
+
+#monitor.jvm.gc.old.warn: 10s
+#monitor.jvm.gc.old.info: 5s
+#monitor.jvm.gc.old.debug: 2s
+
+################################## Security ################################
+
+# Uncomment if you want to enable JSONP as a valid return transport on the
+# http server. With this enabled, it may pose a security risk, so disabling
+# it unless you need it is recommended (it is disabled by default).
+#
+#http.jsonp.enable: true
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/2863013c/elasticsearch/src/main/java/org/apache/karaf/decanter/elasticsearch/EmbeddedNode.java
----------------------------------------------------------------------
diff --git a/elasticsearch/src/main/java/org/apache/karaf/decanter/elasticsearch/EmbeddedNode.java b/elasticsearch/src/main/java/org/apache/karaf/decanter/elasticsearch/EmbeddedNode.java
index 9d86afa..fe551ca 100644
--- a/elasticsearch/src/main/java/org/apache/karaf/decanter/elasticsearch/EmbeddedNode.java
+++ b/elasticsearch/src/main/java/org/apache/karaf/decanter/elasticsearch/EmbeddedNode.java
@@ -16,6 +16,8 @@
*/
package org.apache.karaf.decanter.elasticsearch;
+import org.elasticsearch.common.io.stream.InputStreamStreamInput;
+import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.node.Node;
@@ -24,8 +26,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
-
-import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
+import java.io.FileInputStream;
/**
* Start an Elasticsearch node internally to Karaf.
@@ -33,28 +34,38 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde
public class EmbeddedNode {
private final static Logger LOGGER = LoggerFactory.getLogger(EmbeddedNode.class);
-
- private final static String NODE_NAME = "decanter";
private static Node node;
public EmbeddedNode() throws Exception {
LOGGER.info("Starting Elasticsearch node ...");
LOGGER.debug("Creating elasticsearch settings");
+
String karafHome = System.getProperty("karaf.home");
- File pluginsFile = new File("file://" + karafHome + "/elasticsearch/plugins");
- Settings settings = settingsBuilder()
- .put("cluster.name", "elasticsearch")
- .put("http.enabled", "true")
- .put("node.data", true)
- .put("path.data", "data")
- .put("name", NODE_NAME)
- .put("network.host", "127.0.0.1")
- .put("cluster.routing.schedule", "50ms")
- .put("path.plugins", pluginsFile.getAbsolutePath())
- .put("http.cors.enabled", true)
- .put("http.cors.allow-origin", "/.*/")
- .build();
+ File pluginsFile = new File(new File(karafHome), "/elasticsearch/plugins");
+ LOGGER.debug("Elasticsearch plugins folder: " + pluginsFile.getAbsolutePath());
+
+ Settings settings;
+ File ymlFile = new File(System.getProperty("karaf.etc"), "elasticsearch.yml");
+ if (ymlFile.exists()) {
+ // etc/elasticsearch.yml is provided
+ LOGGER.debug("elasticsearch.yml found for settings");
+ settings = ImmutableSettings.settingsBuilder().loadFromUrl(ymlFile.toURL()).build();
+ } else {
+ // using default
+ LOGGER.debug("Using default elasticsearch configuration");
+ settings = ImmutableSettings.settingsBuilder().put("cluster.name", "elasticsearch")
+ .put("http.enabled", "true")
+ .put("node.data", true)
+ .put("path.data", "data")
+ .put("node.name", System.getProperty("karaf.name") == null ? "decanter" : System.getProperty("karaf.name"))
+ .put("network.host", "127.0.0.1")
+ .put("cluster.routing.schedule", "50ms")
+ .put("path.plugins", pluginsFile.getAbsolutePath())
+ .put("http.cors.enabled", true)
+ .put("http.cors.allow-origin", "/.*/")
+ .build();
+ }
LOGGER.debug("Creating the elasticsearch node");
ImmutableSettings.Builder builder = ImmutableSettings.settingsBuilder();
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/2863013c/elasticsearch/src/test/java/org/apache/karaf/decanter/elasticsearch/TestEmbeddedNode.java
----------------------------------------------------------------------
diff --git a/elasticsearch/src/test/java/org/apache/karaf/decanter/elasticsearch/TestEmbeddedNode.java b/elasticsearch/src/test/java/org/apache/karaf/decanter/elasticsearch/TestEmbeddedNode.java
index f97721e..d036fc5 100644
--- a/elasticsearch/src/test/java/org/apache/karaf/decanter/elasticsearch/TestEmbeddedNode.java
+++ b/elasticsearch/src/test/java/org/apache/karaf/decanter/elasticsearch/TestEmbeddedNode.java
@@ -29,7 +29,10 @@ public class TestEmbeddedNode {
@Test
public void testNode() throws Exception {
-
+
+ System.setProperty("karaf.home", "/tmp");
+ System.setProperty("karaf.name", "decanter-test");
+
EmbeddedNode embeddedNode = new EmbeddedNode();
Node node = embeddedNode.getNode();
embeddedNode.start();