You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/10/20 15:47:15 UTC
[47/50] [abbrv] git commit: Removed tokens and using vnodes
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-events
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