usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [13/50] git commit: Updated elastic search settings
Date Thu, 06 Nov 2014 00:14:59 GMT
Updated elastic search settings


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9e4fe98e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9e4fe98e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9e4fe98e

Branch: refs/heads/two-dot-o
Commit: 9e4fe98e3be6c51f1839ccaecc36dc747f89ea86
Parents: f85b562
Author: Todd Nine <tnine@apigee.com>
Authored: Fri Oct 31 17:32:02 2014 -0600
Committer: Todd Nine <tnine@apigee.com>
Committed: Fri Oct 31 17:32:02 2014 -0600

----------------------------------------------------------------------
 .../dist/init_instance/install_elasticsearch.sh |  8 -------
 .../main/groovy/configure_elasticsearch.groovy  | 25 ++++++++++++--------
 2 files changed, 15 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9e4fe98e/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh b/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
index dfbe929..604cb14 100644
--- a/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
+++ b/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
@@ -35,13 +35,6 @@ chown elasticsearch /mnt/data/elasticsearch
 mkdir -p /mnt/log/elasticsearch
 chown elasticsearch /mnt/log/elasticsearch
 
-mkdir -p /mnt/var/log/elasticsearch
-chown elasticsearch /mnt/var/log/elasticsearch
-
-#Set up the symlink for the logs
-rm -rf /var/log/elasticsearch
-ln -s /mnt/var/log/elasticsearch /var/log/elasticsearch
-
 # Configure ElasticSearch
 cd /usr/share/usergrid/scripts
 
@@ -99,7 +92,6 @@ ES_HEAP_SIZE=${ES_HEAP_SIZE}
 MAX_OPEN_FILES=65535
 MAX_LOCKED_MEMORY=unlimited
 JAVA_HOME=/usr/lib/jvm/jdk1.7.0
-LOG_DIR=/var/log/elasticsearch
 EOF
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9e4fe98e/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy b/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
index 5e853f0..1693777 100644
--- a/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
+++ b/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
@@ -25,9 +25,6 @@
 // registry in SimpleDB
 //
 
-import com.amazonaws.auth.*
-import com.amazonaws.services.simpledb.*
-import com.amazonaws.services.simpledb.model.*
 
 String hostName  = (String)System.getenv().get("PUBLIC_HOSTNAME")
 def clusterName  = (String)System.getenv().get("ES_CLUSTER_NAME")
@@ -59,7 +56,12 @@ path:
     logs: /mnt/log/elasticsearch
     data: /mnt/data/elasticsearch
 
-bootstrap.mlockall: true
+#Set the logging level to INFO by default
+es.logger.level: INFO
+
+#Set our threadpool size.  Our bulk pool and search pools are quite large.  We may want to
turn these down if we
+#overload the system
+
 threadpool.index.type: fixed
 threadpool.index.size: 160
 threadpool.index.queue_size: 401
@@ -79,6 +81,9 @@ action.disable_delete_all_indices: true
 # https://www.loggly.com/blog/nine-tips-configuring-elasticsearch-for-high-performance/
 #################################
 
+#Set the mlock all to better utilize system resources
+bootstrap.mlockall: true
+
 #Only cache 25% of our available memory
 indices.fielddata.cache.size: 25%
 
@@ -86,16 +91,16 @@ indices.fielddata.cache.size: 25%
 indices.fielddata.cache.expire: 10m
 
 #Only allow rebalancing of 2 shards at a time
-cluster.routing.allocation.cluster_concurrent_rebalance:2
+cluster.routing.allocation.cluster_concurrent_rebalance: 2
 
 #Re-shard when our disks start getting full
-cluster.routing.allocation.disk.threshold_enabled:true
-cluster.routing.allocation.disk.watermark.low:.97
-cluster.routing.allocation.disk.watermark.high:.99
+cluster.routing.allocation.disk.threshold_enabled: true
+cluster.routing.allocation.disk.watermark.low: .97
+cluster.routing.allocation.disk.watermark.high: .99
 
 #Set streaming high water marks so reboots don't kill our service
-cluster.routing.allocation.node_concurrent_recoveries:4
-cluster.routing.allocation.node_initial_primaries_recoveries:18
+cluster.routing.allocation.node_concurrent_recoveries: 4
+cluster.routing.allocation.node_initial_primaries_recoveries: 18
 indices.recovery.concurrent_streams: 4
 indices.recovery.max_bytes_per_sec: 40mb
 


Mime
View raw message