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/15 19:33:25 UTC
[3/4] git commit: Updated to ensure yourkit installs correctly
Updated to ensure yourkit installs correctly
Updated to fix opscenter installation
Updated to fix keyspace creation
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6c632f8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6c632f8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6c632f8a
Branch: refs/heads/cloudformation-update
Commit: 6c632f8ae17968fa7acdf049aba77932933a62d5
Parents: 5773760
Author: Todd Nine <to...@apache.org>
Authored: Wed Oct 15 10:46:06 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Wed Oct 15 10:57:30 2014 -0600
----------------------------------------------------------------------
stack/awscluster/pom.xml | 2 +-
stack/awscluster/src/main/cql/create_locks.cql | 24 +-
.../awscluster/src/main/cql/create_usergrid.cql | 80 +---
.../main/cql/create_usergrid_applications.cql | 411 ++-----------------
.../main/dist/init_instance/create_keyspaces.sh | 24 +-
.../init_instance/install_opscenter_agent.sh | 1 +
.../main/dist/init_instance/install_yourkit.sh | 6 +-
.../src/main/groovy/configure_usergrid.groovy | 4 +-
8 files changed, 62 insertions(+), 490 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6c632f8a/stack/awscluster/pom.xml
----------------------------------------------------------------------
diff --git a/stack/awscluster/pom.xml b/stack/awscluster/pom.xml
index 0c0bd46..84142d7 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>alex-cloudformation</aws.s3.release-bucket>
+ <aws.s3.release-bucket>todd-cloudformation</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/6c632f8a/stack/awscluster/src/main/cql/create_locks.cql
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/cql/create_locks.cql b/stack/awscluster/src/main/cql/create_locks.cql
index a3eec9f..fc1de2a 100644
--- a/stack/awscluster/src/main/cql/create_locks.cql
+++ b/stack/awscluster/src/main/cql/create_locks.cql
@@ -18,27 +18,9 @@
drop keyspace Locks;
-create keyspace Locks
- with placement_strategy = 'NetworkTopologyStrategy'
- and strategy_options = {us-east : 3}
- and durable_writes = false;
+create keyspace Locks with placement_strategy = 'NetworkTopologyStrategy' and strategy_options = {KEYSPACE_REGION : 3} and durable_writes = false;
+update keyspace Locks with placement_strategy = 'NetworkTopologyStrategy' and strategy_options = {KEYSPACE_REGION : 3} and durable_writes = false;
use Locks;
-create column family HLocks
- with column_type = 'Standard'
- and comparator = 'UTF8Type'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'UTF8Type'
- and read_repair_chance = 0.0
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 60
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
- and caching = 'ALL'
- and bloom_filter_fp_chance = 0.1
- and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
+create column family HLocks with gc_grace=60 and caching=ALL and read_repair_chance=0.00 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6c632f8a/stack/awscluster/src/main/cql/create_usergrid.cql
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/cql/create_usergrid.cql b/stack/awscluster/src/main/cql/create_usergrid.cql
index c33a81a..deae504 100644
--- a/stack/awscluster/src/main/cql/create_usergrid.cql
+++ b/stack/awscluster/src/main/cql/create_usergrid.cql
@@ -16,81 +16,13 @@
* directory of this distribution.
*/
-create keyspace Usergrid
- with placement_strategy = 'NetworkTopologyStrategy'
- and strategy_options = {us-east : 3}
- and durable_writes = true;
+create keyspace Usergrid with placement_strategy = 'NetworkTopologyStrategy' and strategy_options = {KEYSPACE_REGION : 3} and durable_writes = true;
+update keyspace Usergrid with placement_strategy = 'NetworkTopologyStrategy' and strategy_options = {KEYSPACE_REGION : 3} and durable_writes = true;
use Usergrid;
-create column family Applications
- with column_type = 'Standard'
- and comparator = 'BytesType'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and bloom_filter_fp_chance = 0.1
- and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
+create column family Applications with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family PrincipalTokens with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Properties with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Tokens with caching=ALL and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
-create column family PrincipalTokens
- with column_type = 'Standard'
- and comparator = 'UUIDType'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and bloom_filter_fp_chance = 0.1
- and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Properties
- with column_type = 'Standard'
- and comparator = 'BytesType'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and bloom_filter_fp_chance = 0.1
- and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Tokens
- with column_type = 'Standard'
- and comparator = 'BytesType'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
- and caching = 'ALL'
- and bloom_filter_fp_chance = 0.1
- and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6c632f8a/stack/awscluster/src/main/cql/create_usergrid_applications.cql
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/cql/create_usergrid_applications.cql b/stack/awscluster/src/main/cql/create_usergrid_applications.cql
index 3a80567..bb3d29a 100644
--- a/stack/awscluster/src/main/cql/create_usergrid_applications.cql
+++ b/stack/awscluster/src/main/cql/create_usergrid_applications.cql
@@ -16,393 +16,32 @@
* directory of this distribution.
*/
-create keyspace Usergrid_Applications
- with placement_strategy = 'NetworkTopologyStrategy'
- and strategy_options = {us-east : 3}
- and durable_writes = true;
+create keyspace Usergrid_Applications with placement_strategy = 'NetworkTopologyStrategy' and strategy_options = {KEYSPACE_REGION : 3} and durable_writes = true;
+update keyspace Usergrid_Applications with placement_strategy = 'NetworkTopologyStrategy' and strategy_options = {KEYSPACE_REGION : 3} and durable_writes = true;
use Usergrid_Applications;
-create column family Application_Aggregate_Counters
- with column_type = 'Standard'
- and comparator = 'LongType'
- and default_validation_class = 'CounterColumnType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
+create column family Application_Aggregate_Counters with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Application_Roles with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Applications with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Consumer_Queue_Messages_Properties with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Entity_Composite_Dictionaries with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Entity_Counters with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Entity_Dictionaries with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Entity_Id_Sets with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Entity_Index with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Entity_Index_Entries with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Entity_Metadata with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Entity_Properties with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Entity_Unique with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family MQ_Consumers with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family MQ_Consumers_Timeout with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family MQ_Counters with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family MQ_Property_Index with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family MQ_Property_Index_Entries with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Queue_Dictionaries with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Queue_Inbox with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Queue_Properties with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Queue_Subscribers with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Queue_Subscriptions with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
-create column family Application_Roles
- with column_type = 'Standard'
- and comparator = 'BytesType'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Applications
- with column_type = 'Standard'
- and comparator = 'BytesType'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Consumer_Queue_Messages_Properties
- with column_type = 'Standard'
- and comparator = 'BytesType'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Entity_Composite_Dictionaries
- with column_type = 'Standard'
- and comparator = 'DynamicCompositeType(b=>org.apache.cassandra.db.marshal.BytesType,A=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.AsciiType),B=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.BytesType),a=>org.apache.cassandra.db.marshal.AsciiType,L=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.LongType),l=>org.apache.cassandra.db.marshal.LongType,I=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.IntegerType),i=>org.apache.cassandra.db.marshal.IntegerType,U=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UUIDType),T=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.TimeUUIDType),u=>org.apache.cassandra.db.marshal.UUIDType,t=>org.apache.cassandra.db.marshal.TimeUUIDType,s=>org.apache.cassandra.db.marshal.UTF8Type,S=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UTF8Type),
X=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.LexicalUUIDType),x=>org.apache.cassandra.db.marshal.LexicalUUIDType)'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and bloom_filter_fp_chance = 0.1
- and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Entity_Counters
- with column_type = 'Standard'
- and comparator = 'BytesType'
- and default_validation_class = 'CounterColumnType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Entity_Dictionaries
- with column_type = 'Standard'
- and comparator = 'BytesType'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and bloom_filter_fp_chance = 0.1
- and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Entity_Id_Sets
- with column_type = 'Standard'
- and comparator = 'UUIDType'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and bloom_filter_fp_chance = 0.1
- and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Entity_Index
- with column_type = 'Standard'
- and comparator = 'DynamicCompositeType(b=>org.apache.cassandra.db.marshal.BytesType,A=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.AsciiType),B=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.BytesType),a=>org.apache.cassandra.db.marshal.AsciiType,L=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.LongType),l=>org.apache.cassandra.db.marshal.LongType,I=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.IntegerType),i=>org.apache.cassandra.db.marshal.IntegerType,U=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UUIDType),T=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.TimeUUIDType),u=>org.apache.cassandra.db.marshal.UUIDType,t=>org.apache.cassandra.db.marshal.TimeUUIDType,s=>org.apache.cassandra.db.marshal.UTF8Type,S=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UTF8Type),
X=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.LexicalUUIDType),x=>org.apache.cassandra.db.marshal.LexicalUUIDType)'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and bloom_filter_fp_chance = 0.1
- and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Entity_Index_Entries
- with column_type = 'Standard'
- and comparator = 'DynamicCompositeType(b=>org.apache.cassandra.db.marshal.BytesType,A=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.AsciiType),B=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.BytesType),a=>org.apache.cassandra.db.marshal.AsciiType,L=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.LongType),l=>org.apache.cassandra.db.marshal.LongType,I=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.IntegerType),i=>org.apache.cassandra.db.marshal.IntegerType,U=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UUIDType),T=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.TimeUUIDType),u=>org.apache.cassandra.db.marshal.UUIDType,t=>org.apache.cassandra.db.marshal.TimeUUIDType,s=>org.apache.cassandra.db.marshal.UTF8Type,S=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UTF8Type),
X=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.LexicalUUIDType),x=>org.apache.cassandra.db.marshal.LexicalUUIDType)'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and bloom_filter_fp_chance = 0.1
- and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Entity_Metadata
- with column_type = 'Standard'
- and comparator = 'BytesType'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and bloom_filter_fp_chance = 0.1
- and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Entity_Properties
- with column_type = 'Standard'
- and comparator = 'BytesType'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and bloom_filter_fp_chance = 0.1
- and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Entity_Unique
- with column_type = 'Standard'
- and comparator = 'UUIDType'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and bloom_filter_fp_chance = 0.1
- and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family MQ_Consumers
- with column_type = 'Standard'
- and comparator = 'BytesType'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family MQ_Consumers_Timeout
- with column_type = 'Standard'
- and comparator = 'UUIDType'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family MQ_Counters
- with column_type = 'Standard'
- and comparator = 'BytesType'
- and default_validation_class = 'CounterColumnType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family MQ_Property_Index
- with column_type = 'Standard'
- and comparator = 'DynamicCompositeType(b=>org.apache.cassandra.db.marshal.BytesType,A=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.AsciiType),B=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.BytesType),a=>org.apache.cassandra.db.marshal.AsciiType,L=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.LongType),l=>org.apache.cassandra.db.marshal.LongType,I=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.IntegerType),i=>org.apache.cassandra.db.marshal.IntegerType,U=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UUIDType),T=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.TimeUUIDType),u=>org.apache.cassandra.db.marshal.UUIDType,t=>org.apache.cassandra.db.marshal.TimeUUIDType,s=>org.apache.cassandra.db.marshal.UTF8Type,S=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UTF8Type),
X=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.LexicalUUIDType),x=>org.apache.cassandra.db.marshal.LexicalUUIDType)'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family MQ_Property_Index_Entries
- with column_type = 'Standard'
- and comparator = 'DynamicCompositeType(b=>org.apache.cassandra.db.marshal.BytesType,A=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.AsciiType),B=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.BytesType),a=>org.apache.cassandra.db.marshal.AsciiType,L=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.LongType),l=>org.apache.cassandra.db.marshal.LongType,I=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.IntegerType),i=>org.apache.cassandra.db.marshal.IntegerType,U=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UUIDType),T=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.TimeUUIDType),u=>org.apache.cassandra.db.marshal.UUIDType,t=>org.apache.cassandra.db.marshal.TimeUUIDType,s=>org.apache.cassandra.db.marshal.UTF8Type,S=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UTF8Type),
X=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.LexicalUUIDType),x=>org.apache.cassandra.db.marshal.LexicalUUIDType)'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Queue_Dictionaries
- with column_type = 'Standard'
- and comparator = 'BytesType'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Queue_Inbox
- with column_type = 'Standard'
- and comparator = 'UUIDType'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Queue_Properties
- with column_type = 'Standard'
- and comparator = 'BytesType'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Queue_Subscribers
- with column_type = 'Standard'
- and comparator = 'BytesType'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Queue_Subscriptions
- with column_type = 'Standard'
- and comparator = 'BytesType'
- and default_validation_class = 'BytesType'
- and key_validation_class = 'BytesType'
- and read_repair_chance = 0.1
- and dclocal_read_repair_chance = 0.0
- and populate_io_cache_on_flush = false
- and gc_grace = 864000
- and min_compaction_threshold = 4
- and max_compaction_threshold = 32
- and replicate_on_write = true
- and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
- and caching = 'KEYS_ONLY'
- and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6c632f8a/stack/awscluster/src/main/dist/init_instance/create_keyspaces.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/create_keyspaces.sh b/stack/awscluster/src/main/dist/init_instance/create_keyspaces.sh
index 1151a9f..f2ebe8f 100644
--- a/stack/awscluster/src/main/dist/init_instance/create_keyspaces.sh
+++ b/stack/awscluster/src/main/dist/init_instance/create_keyspaces.sh
@@ -28,11 +28,27 @@ FIRSTHOST="$(groovy get_first_instance.groovy cassandra)"
if [ "$FIRSTHOST"=="$PUBLIC_HOSTNAME" ]; then
-cd /usr/share/usergrid/cql
-/usr/bin/cassandra-cli -f create_locks.cql
-/usr/bin/cassandra-cli -f create_usergrid.cql
-/usr/bin/cassandra-cli -f create_usergrid_applications.cql
+#Update the keyspace replication and run the cql
+sed -i.bak "s/KEYSPACE_REGION/${EC2_REGION}/g" /usr/share/usergrid/cql/create_locks.cql
+
+/usr/bin/cassandra-cli -f /usr/share/usergrid/cql/create_locks.cql
+
+
+
+
+#Update the keyspace region and run the cql
+sed -i.bak "s/KEYSPACE_REGION/${EC2_REGION}/g" /usr/share/usergrid/cql/create_usergrid.cql
+
+/usr/bin/cassandra-cli -f /usr/share/usergrid/cql/create_usergrid.cql
+
+
+
+
+#Update the keyspace region and run the cql
+sed -i.bak "s/KEYSPACE_REGION/${EC2_REGION}/g" /usr/share/usergrid/cql/create_usergrid_applications.cql
+
+/usr/bin/cassandra-cli -f /usr/share/usergrid/cql/create_usergrid_applications.cql
fi
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6c632f8a/stack/awscluster/src/main/dist/init_instance/install_opscenter_agent.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/install_opscenter_agent.sh b/stack/awscluster/src/main/dist/init_instance/install_opscenter_agent.sh
index 447da6f..17ec780 100644
--- a/stack/awscluster/src/main/dist/init_instance/install_opscenter_agent.sh
+++ b/stack/awscluster/src/main/dist/init_instance/install_opscenter_agent.sh
@@ -30,6 +30,7 @@ sudo apt-get update
sudo apt-get install datastax-agent
+cd /usr/share/usergrid/scripts
groovy configure_opscenter_agent.groovy > /var/lib/datastax-agent/conf/address.yaml
sudo service datastax-agent start
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6c632f8a/stack/awscluster/src/main/dist/init_instance/install_yourkit.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/install_yourkit.sh b/stack/awscluster/src/main/dist/init_instance/install_yourkit.sh
index 3812612..e117db7 100644
--- a/stack/awscluster/src/main/dist/init_instance/install_yourkit.sh
+++ b/stack/awscluster/src/main/dist/init_instance/install_yourkit.sh
@@ -25,15 +25,15 @@ if [[ $YOURKIT = "true" ]]; then
mkdir -p /mnt/yourkit
cd /mnt/yourkit
-s3cmd --config=/etc/s3cfg get s3://${RELEASE_BUCKET}/yjp-2014-build-14104.zip
-unzip /mnt/yourkit/yjp-2014-build-14104.zip
+s3cmd --config=/etc/s3cfg get s3://${RELEASE_BUCKET}/yjp-2014-build-14108.zip
+unzip /mnt/yourkit/yjp-2014-build-14108.zip
mkdir -p /mnt/yourkitreports
chown -R tomcat7.tomcat7 /mnt/yourkitreports
cat >> /etc/default/tomcat7 << EOF
-JAVA_OPTS="${JAVA_OPTS} -agentpath:/mnt/yourkit/yjp-2014-build-14104/bin/linux-x86-64/libyjpagent.so=port=10001,logdir=/mnt/yourkitreports,dir=/mnt/yourkitreports,onexit=snapshot"
+JAVA_OPTS="${JAVA_OPTS} -agentpath:/mnt/yourkit/yjp-2014-build-14108/bin/linux-x86-64/libyjpagent.so=port=10001,logdir=/mnt/yourkitreports,dir=/mnt/yourkitreports,onexit=snapshot"
EOF
fi
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6c632f8a/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 a0a051c..03b3077 100644
--- a/stack/awscluster/src/main/groovy/configure_usergrid.groovy
+++ b/stack/awscluster/src/main/groovy/configure_usergrid.groovy
@@ -43,6 +43,8 @@ def testAdminUserEmail = System.getenv().get("TEST_ADMIN_USER_EMAIL")
def cassThreads = System.getenv().get("TOMCAT_THREADS")
def hystrixThreads = Integer.parseInt(cassThreads) / 100
+def ec2Region = System.getenv().get("EC2_REGION")
+
NodeRegistry registry = new NodeRegistry();
@@ -81,7 +83,7 @@ def usergridConfig = """
cassandra.url=${cassandras}
cassandra.cluster=${clusterName}
cassandra.keyspace.strategy=org.apache.cassandra.locator.SimpleStrategy
-cassandra.keyspace.replication=${replFactor}
+cassandra.keyspace.replication=${ec2Region}:${replFactor}
cassandra.timeout=5000
cassandra.connections=${cassThreads}