You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2014/12/10 01:54:29 UTC

[13/15] incubator-usergrid git commit: Changed tomcat configuration to be configured based on number of processors and threads per core

Changed tomcat configuration to be configured based on number of processors and threads per core


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

Branch: refs/heads/two-dot-o
Commit: 692eff82361af0eaa0824bf47cb70a20ec0bd184
Parents: ecce52d
Author: Todd Nine <tn...@apigee.com>
Authored: Fri Dec 5 15:46:07 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Fri Dec 5 15:46:07 2014 -0700

----------------------------------------------------------------------
 .../main/dist/init_instance/init_rest_server.sh   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/692eff82/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh b/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
index 924fb49..3d5fdaf 100644
--- a/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
+++ b/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
@@ -68,51 +68,51 @@ export ACCEPT_COUNT=100
 export NR_OPEN=1048576
 export FILE_MAX=761773
 
+#Number of threads to allow per core
+export NUM_THREAD_PROC=25
+
+#Get the number of processors
+export NUM_PROC=$(nproc)
+
+#Configure the max amount of tomcat threads
+export TOMCAT_THREADS=$((${NUM_PROC} * ${NUM_THREAD_PROC}))
+
 case `(curl http://169.254.169.254/latest/meta-data/instance-type)` in
 'm1.small' )
     # total of 1.7g
     export TOMCAT_RAM=1190m
-    export TOMCAT_THREADS=300
 ;;
 'm1.medium' )
     # total of 3.75g
     export TOMCAT_RAM=2625m
-    export TOMCAT_THREADS=500
 ;;
 'm1.large' )
     # total of 7.5g
     export TOMCAT_RAM=5250m
-    export TOMCAT_THREADS=1000
 ;;
 'm1.xlarge' )
     # total of 15g
     export TOMCAT_RAM=10500m
-    export TOMCAT_THREADS=2000
 ;;
 'm3.large' )
     # total of 7.5g
     export TOMCAT_RAM=5250m
-    export TOMCAT_THREADS=1600
 ;;
 'm3.xlarge' )
     # total of 15g
     export TOMCAT_RAM=10500m
-    export TOMCAT_THREADS=3300
 ;;
 'c3.xlarge' )
     # total of 7.5g
     export TOMCAT_RAM=4096m
-    export TOMCAT_THREADS=1000
 ;;
 'c3.2xlarge' )
     # total of 15g
     export TOMCAT_RAM=10500m
-    export TOMCAT_THREADS=2000
 ;;
 'c3.4xlarge' )
     # total of 30g
     export TOMCAT_RAM=21000m
-    export TOMCAT_THREADS=4000
 esac