usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [1/2] git commit: Cleaned up instance sizes and fixed heap options for elastic search
Date Tue, 04 Nov 2014 00:21:41 GMT
Repository: incubator-usergrid
Updated Branches:
  refs/heads/key-row-sharding c69593e72 -> 018673c30


Cleaned up instance sizes and fixed heap options for elastic search


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

Branch: refs/heads/key-row-sharding
Commit: ff31e80d8c8af0d1e13735cc0f4e61e3d8a8ee87
Parents: cb6647a
Author: Todd Nine <tnine@apigee.com>
Authored: Mon Nov 3 17:21:24 2014 -0700
Committer: Todd Nine <tnine@apigee.com>
Committed: Mon Nov 3 17:21:24 2014 -0700

----------------------------------------------------------------------
 .../dist/init_instance/install_elasticsearch.sh | 30 ++++----------------
 stack/awscluster/ugcluster-cf.json              | 20 ++++---------
 2 files changed, 11 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ff31e80d/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 73195dc..67d9866 100644
--- a/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
+++ b/stack/awscluster/src/main/dist/init_instance/install_elasticsearch.sh
@@ -48,41 +48,21 @@ groovy wait_for_instances.groovy elasticsearch ${ES_NUM_SERVERS}
 
 # leave room for Cassandra: use about one half of RAM for heap
 case `(curl http://169.254.169.254/latest/meta-data/instance-type)` in
-'m1.small' )
-    # total of 1.7g
-    export ES_HEAP_SIZE=850m
-;;
-'m1.medium' )
-    # total of 3.75g
-    export ES_HEAP_SIZE=1700m
-;;
-'m1.large' )
-    # total of 7.5g
-    export ES_HEAP_SIZE=3500m
-;;
-'m1.xlarge' )
-    # total of 15g
-    export ES_HEAP_SIZE=7500m
-;;
-'m3.large' )
-    # total of 7.5g
-    export ES_HEAP_SIZE=3500m
-;;
-'m3.xlarge' )
+'c3.large' )
     # total of 15g 
-    export ES_HEAP_SIZE=7500m
+    export ES_HEAP_SIZE=1920m
 ;;
 'c3.xlarge' )
     # total of 7.5g
-    export ES_HEAP_SIZE=3500m
+    export ES_HEAP_SIZE=3840m
 ;;
 'c3.2xlarge' )
     # total of 15g
-    export ES_HEAP_SIZE=7500m
+    export ES_HEAP_SIZE=7680m
 ;;
 'c3.4xlarge' )
     # total of 30g
-    export ES_HEAP_SIZE=24g
+    export ES_HEAP_SIZE=15g
 esac
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ff31e80d/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json
index f9979b1..b49e649 100644
--- a/stack/awscluster/ugcluster-cf.json
+++ b/stack/awscluster/ugcluster-cf.json
@@ -65,14 +65,10 @@
         "CassInstanceType": {
             "Description": "Instance type for Cass servers",
             "Type": "String",
-            "Default": "c3.2xlarge",
+            "Default": "c3.4xlarge",
             "AllowedValues": [
-                "m1.small",
-                "m1.medium",
-                "m1.large",
-                "m1.xlarge",
-                "m3.xlarge",
-                "m3.2xlarge",
+                "c3.large",
+                "c3.xlarge",
                 "c3.2xlarge",
                 "c3.4xlarge"
             ],
@@ -98,14 +94,10 @@
         "ESInstanceType": {
             "Description": "Instance type for ES servers",
             "Type": "String",
-            "Default": "c3.2xlarge",
+            "Default": "c3.4xlarge",
             "AllowedValues": [
-                "m1.small",
-                "m1.medium",
-                "m1.large",
-                "m1.xlarge",
-                "m3.xlarge",
-                "m3.2xlarge",
+                "c3.large",
+                "c3.xlarge",
                 "c3.2xlarge",
                 "c3.4xlarge"
             ],


Mime
View raw message