usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [10/14] git commit: Temp commit, overwrite
Date Tue, 04 Nov 2014 22:59:32 GMT
Temp commit, overwrite


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

Branch: refs/heads/key-row-sharding
Commit: ac9740ba4a72825fe0753556f0450314b8c3f973
Parents: 74e365a
Author: Todd Nine <tnine@apigee.com>
Authored: Tue Nov 4 09:41:44 2014 -0700
Committer: Todd Nine <tnine@apigee.com>
Committed: Tue Nov 4 09:41:44 2014 -0700

----------------------------------------------------------------------
 .../main/groovy/configure_elasticsearch.groovy  | 32 ++++++++++++++------
 .../groovy/configure_opscenter_usergrid.groovy  |  6 ++--
 .../src/main/groovy/configure_usergrid.groovy   |  5 ++-
 3 files changed, 29 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ac9740ba/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 cd91026..355bde2 100644
--- a/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
+++ b/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
@@ -62,15 +62,19 @@ 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: 0
-threadpool.bulk.type: fixed
-threadpool.bulk.size: 1000
-threadpool.bulk.queue_size: 0
-threadpool.search.size: 10000
-threadpool.search.type: fixed
-threadpool.search.queue_size: 0
+threadpool:
+    index:
+        type: fixed
+        size: 160
+        queue_size: 0
+    bulk:
+        type: fixed
+        size: 5000
+        queue_size: 100
+    search:
+        size: 10000
+        type: fixed
+        queue_size: 100
 
 action.auto_create_index: false
 
@@ -88,7 +92,7 @@ bootstrap.mlockall: true
 indices.fielddata.cache.size: 25%
 
 #If you haven't used it in 10 minutes, evict it from the cache
-indices.fielddata.cache.expire: 10m
+#indices.fielddata.cache.expire: 10m
 
 #Only allow rebalancing of 2 shards at a time
 cluster.routing.allocation.cluster_concurrent_rebalance: 2
@@ -104,6 +108,14 @@ cluster.routing.allocation.node_initial_primaries_recoveries: 18
 indices.recovery.concurrent_streams: 4
 indices.recovery.max_bytes_per_sec: 40mb
 
+
+###############
+# Logging options
+# We want to turn on logging for slow queries and executions, so
+###############
+
+
+
 """
 
 println elasticSearchConfig

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ac9740ba/stack/awscluster/src/main/groovy/configure_opscenter_usergrid.groovy
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/groovy/configure_opscenter_usergrid.groovy b/stack/awscluster/src/main/groovy/configure_opscenter_usergrid.groovy
index df4dcae..150018c 100644
--- a/stack/awscluster/src/main/groovy/configure_opscenter_usergrid.groovy
+++ b/stack/awscluster/src/main/groovy/configure_opscenter_usergrid.groovy
@@ -48,9 +48,9 @@ def usergridConfig = """
 seed_hosts = ${seeds}
 
 #TODO, this doesn't seem to work, I think opscenter is broken.  Try this again at a later
time and remove opscenter exclusion below
-#[storage_cassandra]
-#seed_hosts = ${hostName}
-#api_port = 9160
+[storage_cassandra]
+seed_hosts = ${hostName}
+api_port = 9160
 
 
 """

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ac9740ba/stack/awscluster/src/main/groovy/configure_usergrid.groovy
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/groovy/configure_usergrid.groovy b/stack/awscluster/src/main/groovy/configure_usergrid.groovy
index bbbcd41..d18c995 100644
--- a/stack/awscluster/src/main/groovy/configure_usergrid.groovy
+++ b/stack/awscluster/src/main/groovy/configure_usergrid.groovy
@@ -41,7 +41,10 @@ def superUserEmail     = System.getenv().get("SUPER_USER_EMAIL")
 def testAdminUserEmail = System.getenv().get("TEST_ADMIN_USER_EMAIL")
 
 def numEsNodes = Integer.parseInt(System.getenv().get("ES_NUM_SERVERS"))
-def esShards = numEsNodes/2;
+//Override number of shards.  Set it to 2x the cluster size
+def esShards = numEsNodes*2;
+
+
 def esReplicas = 2;
 
 def cassThreads = System.getenv().get("TOMCAT_THREADS")


Mime
View raw message