You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/18 04:19:05 UTC
[1/5] git commit: Fixes issue with AWS props location
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o 3914d6874 -> ee0f28c7a
Fixes issue with AWS props location
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/01772027
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/01772027
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/01772027
Branch: refs/heads/two-dot-o
Commit: 017720278d987353d502a69f3fcf13c0f7fb7bb5
Parents: 3914d68
Author: Todd Nine <to...@apache.org>
Authored: Fri Oct 17 18:16:24 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Fri Oct 17 18:16:24 2014 -0600
----------------------------------------------------------------------
.../awscluster/src/main/dist/init_instance/init_rest_server.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/01772027/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 b370f34..28fbc48 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
@@ -114,6 +114,11 @@ export TOMCAT_CONNECTIONS=10000
sed -i.bak "s/Xmx128m/Xmx${TOMCAT_RAM} -Xms${TOMCAT_RAM} -Dlog4j\.configuration=file:\/usr\/share\/usergrid\/lib\/log4j\.properties/g" /etc/default/tomcat7
sed -i.bak "s/<Connector/<Connector maxThreads=\"${TOMCAT_THREADS}\" acceptCount=\"${TOMCAT_THREADS}\" maxConnections=\"${TOMCAT_CONNECTIONS}\"/g" /var/lib/tomcat7/conf/server.xml
+
+#Append our java opts for secret key
+echo "JAVA_OPTS=\"\${JAVA_OPTS} -DAWS_SECRET_KEY=${AWS_SECRET_KEY} -DAWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY}\"" >> /etc/default/tomcat7
+
+
# set file limits
sed -i.bak "s/# \/etc\/init\.d\/tomcat7 -- startup script for the Tomcat 6 servlet engine/ulimit -n ${NOFILE}/" /etc/init.d/tomcat7
sed -i.bak "s/@student/a *\t\thard\tnofile\t\t${NOFILE}\n*\t\tsoft\tnofile\t\t${NOFILE}" /etc/security/limits.conf
@@ -148,7 +153,6 @@ mkdir -p /usr/share/tomcat7/lib
groovy configure_usergrid.groovy > /usr/share/tomcat7/lib/usergrid-deployment.properties
groovy configure_portal_new.groovy >> /var/lib/tomcat7/webapps/portal/config.js
-sudo sed -i '98i export CATALINA_OPTS=\"-DAWS_SECRET_KEY=${AWS_SECRET_KEY} -DAWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY} ${CATALINA_OPTS}\"' /usr/share/tomcat7/bin/catalina.sh
#Install postfix so that we can send mail
[2/5] git commit: Changed health check to 10 seconds
Posted by to...@apache.org.
Changed health check to 10 seconds
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e361ea8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e361ea8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e361ea8e
Branch: refs/heads/two-dot-o
Commit: e361ea8ef61f2d94a120b0b66203e7d46c4bdc9e
Parents: 0177202
Author: Todd Nine <to...@apache.org>
Authored: Fri Oct 17 18:17:40 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Fri Oct 17 18:17:40 2014 -0600
----------------------------------------------------------------------
stack/awscluster/ugcluster-cf.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e361ea8e/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json
index dea9694..0e5570d 100644
--- a/stack/awscluster/ugcluster-cf.json
+++ b/stack/awscluster/ugcluster-cf.json
@@ -1089,7 +1089,7 @@
"Target": "HTTP:8080/status",
"HealthyThreshold": "2",
"UnhealthyThreshold": "8",
- "Interval": "30",
+ "Interval": "10",
"Timeout": "5"
},
"CrossZone": "true"
[5/5] git commit: Fixes cassandra heap
Posted by to...@apache.org.
Fixes cassandra heap
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ee0f28c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ee0f28c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ee0f28c7
Branch: refs/heads/two-dot-o
Commit: ee0f28c7a55b6e6d986b74fdb696e80fb6116fd3
Parents: f7b7513
Author: Todd Nine <to...@apache.org>
Authored: Fri Oct 17 20:07:13 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Fri Oct 17 20:14:57 2014 -0600
----------------------------------------------------------------------
stack/awscluster/src/main/dist/init_instance/install_cassandra.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ee0f28c7/stack/awscluster/src/main/dist/init_instance/install_cassandra.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/install_cassandra.sh b/stack/awscluster/src/main/dist/init_instance/install_cassandra.sh
index 0e7c465..3d55c6d 100644
--- a/stack/awscluster/src/main/dist/init_instance/install_cassandra.sh
+++ b/stack/awscluster/src/main/dist/init_instance/install_cassandra.sh
@@ -39,8 +39,9 @@ cd /usr/share/usergrid/scripts
groovy registry_register.groovy cassandra
groovy wait_for_instances.groovy cassandra ${CASSANDRA_NUM_SERVERS}
+#TODO make this configurable for the box sizes
#Set or min/max heap to 8GB
-sed -i.bak s/calculate_heap_sizes\(\)/MAX_HEAP_SIZE="8G"\\nHEAP_NEWSIZE="1200M"\\n\ncalculate_heap_sizes\(\)/g /etc/cassandra/cassandra-env.sh
+sed -i.bak s/calculate_heap_sizes\(\)/MAX_HEAP_SIZE=\"8G\"\\nHEAP_NEWSIZE=\"1200M\"\\n\\ncalculate_heap_sizes\(\)/g /etc/cassandra/cassandra-env.sh
cd /usr/share/usergrid/scripts
groovy configure_cassandra.groovy > /etc/cassandra/cassandra.yaml
[3/5] git commit: Removed tokens and using vnodes
Posted by to...@apache.org.
Removed tokens and using vnodes
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/fc6ac11b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/fc6ac11b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/fc6ac11b
Branch: refs/heads/two-dot-o
Commit: fc6ac11bfa814fedb2cb66d131b113fa91016723
Parents: e361ea8
Author: Todd Nine <to...@apache.org>
Authored: Fri Oct 17 19:27:53 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Fri Oct 17 19:27:53 2014 -0600
----------------------------------------------------------------------
stack/awscluster/pom.xml | 2 +-
.../src/main/groovy/configure_cassandra.groovy | 26 +-------------------
2 files changed, 2 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/fc6ac11b/stack/awscluster/pom.xml
----------------------------------------------------------------------
diff --git a/stack/awscluster/pom.xml b/stack/awscluster/pom.xml
index 84142d7..2971e3c 100644
--- a/stack/awscluster/pom.xml
+++ b/stack/awscluster/pom.xml
@@ -30,7 +30,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <aws.s3.release-bucket>todd-cloudformation</aws.s3.release-bucket>
+ <aws.s3.release-bucket>ug-cloudformation-todd</aws.s3.release-bucket>
<stack.war>../rest/target/ROOT.war</stack.war>
<portal.dir>../../portal/dist/usergrid-portal</portal.dir>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/fc6ac11b/stack/awscluster/src/main/groovy/configure_cassandra.groovy
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/groovy/configure_cassandra.groovy b/stack/awscluster/src/main/groovy/configure_cassandra.groovy
index 9e5ded2..946e801 100644
--- a/stack/awscluster/src/main/groovy/configure_cassandra.groovy
+++ b/stack/awscluster/src/main/groovy/configure_cassandra.groovy
@@ -29,7 +29,6 @@ import com.amazonaws.services.simpledb.model.*
String hostName = (String)System.getenv().get("PUBLIC_HOSTNAME")
String clusterName = (String)System.getenv().get("CASSANDRA_CLUSTER_NAME")
-int cassNumServers = ((String)System.getenv().get("CASSANDRA_NUM_SERVERS")).toInteger()
// build seed list by listing all Cassandra nodes found in SimpleDB domain with our stackName
@@ -45,29 +44,6 @@ for (host in selectResult) {
}
-int index = 0;
-int count = 0;
-
-for (name in selectResult) {
-
- //get our index so that we know which token to get
- if (name == hostName) {
- index = count
- break
- }
-
- count++
-}
-
-long[] tokens = new long[cassNumServers]
-
-for(int i =0; i < cassNumServers; i ++){
- tokens[i] = ((2**64 / cassNumServers) * i) - 2**63
-}
-
-String token = tokens[index]
-
-
def cassandraConfig = """
@@ -78,7 +54,7 @@ seed_provider:
parameters:
- seeds: "${seeds}"
auto_bootstrap: false
-initial_token: ${token}
+num_tokens: 256
hinted_handoff_enabled: true
hinted_handoff_throttle_in_kb: 1024
max_hints_delivery_threads: 2
[4/5] git commit: Fixes cassandra heap
Posted by to...@apache.org.
Fixes cassandra heap
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f7b75139
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f7b75139
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f7b75139
Branch: refs/heads/two-dot-o
Commit: f7b751393b50c357ec3061f19009220aa9beae09
Parents: fc6ac11
Author: Todd Nine <to...@apache.org>
Authored: Fri Oct 17 20:06:46 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Fri Oct 17 20:06:46 2014 -0600
----------------------------------------------------------------------
stack/awscluster/src/main/dist/init_instance/install_cassandra.sh | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f7b75139/stack/awscluster/src/main/dist/init_instance/install_cassandra.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/install_cassandra.sh b/stack/awscluster/src/main/dist/init_instance/install_cassandra.sh
index 280ae40..0e7c465 100644
--- a/stack/awscluster/src/main/dist/init_instance/install_cassandra.sh
+++ b/stack/awscluster/src/main/dist/init_instance/install_cassandra.sh
@@ -39,6 +39,9 @@ cd /usr/share/usergrid/scripts
groovy registry_register.groovy cassandra
groovy wait_for_instances.groovy cassandra ${CASSANDRA_NUM_SERVERS}
+#Set or min/max heap to 8GB
+sed -i.bak s/calculate_heap_sizes\(\)/MAX_HEAP_SIZE="8G"\\nHEAP_NEWSIZE="1200M"\\n\ncalculate_heap_sizes\(\)/g /etc/cassandra/cassandra-env.sh
+
cd /usr/share/usergrid/scripts
groovy configure_cassandra.groovy > /etc/cassandra/cassandra.yaml
/etc/init.d/cassandra start