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/11/04 23:59:23 UTC
[01/14] git commit: Upping surefire version to 2.7
Repository: incubator-usergrid
Updated Branches:
refs/heads/key-row-sharding e351179c9 -> c3f01dc93
Upping surefire version to 2.7
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/46106a85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/46106a85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/46106a85
Branch: refs/heads/key-row-sharding
Commit: 46106a859ca64e665afebdf7389923efd90aeb31
Parents: deaa46c
Author: ryan bridges <rb...@apigee.com>
Authored: Mon Oct 6 09:39:55 2014 -0400
Committer: ryan bridges <rb...@apigee.com>
Committed: Mon Oct 6 09:39:55 2014 -0400
----------------------------------------------------------------------
stack/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/46106a85/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index e105c79..f89a51c 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -171,7 +171,7 @@
<developer>
<id>snoopdave</id>
<name>Dave Johnson</name>
- </developer>
+ </developer>
</developers>
@@ -207,7 +207,7 @@
<module>launcher</module>
-->
<module>mongo-emulator</module>
- <!--
+ <!--
Re-enable when query-validator updated to work with Core Persistence.
https://issues.apache.org/jira/browse/USERGRID-221
<module>query-validator</module>
@@ -1670,13 +1670,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.15</version>
+ <version>2.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.15</version>
+ <version>2.7</version>
<configuration>
<parallel>${usergrid.it.parallel}</parallel>
<forkCount>${usergrid.it.forkCount}</forkCount>
[14/14] git commit: Merge branch 'key-row-sharding' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
key-row-sharding
Posted by to...@apache.org.
Merge branch 'key-row-sharding' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into key-row-sharding
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c3f01dc9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c3f01dc9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c3f01dc9
Branch: refs/heads/key-row-sharding
Commit: c3f01dc93dc9739ef43a81508c7c64cd5953813d
Parents: 839f817 e351179
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Nov 4 15:58:59 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Nov 4 15:58:59 2014 -0700
----------------------------------------------------------------------
.../apache/usergrid/scenarios/ApplicationScenarios.scala | 2 +-
.../apache/usergrid/scenarios/NotificationScenarios.scala | 6 ++++++
.../org/apache/usergrid/scenarios/NotifierScenarios.scala | 6 ++++++
.../apache/usergrid/scenarios/OrganizationScenarios.scala | 10 +++++-----
.../PushNotificationTargetUserSimulation.scala | 2 +-
5 files changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[04/14] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into two-dot-o
Posted by to...@apache.org.
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/dafb27e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/dafb27e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/dafb27e6
Branch: refs/heads/key-row-sharding
Commit: dafb27e6b9817b9beb16be92f50e6432b8482b6d
Parents: 2aa0953 fc3c42c
Author: ryan bridges <rb...@apigee.com>
Authored: Fri Oct 24 12:33:53 2014 -0400
Committer: ryan bridges <rb...@apigee.com>
Committed: Fri Oct 24 12:33:53 2014 -0400
----------------------------------------------------------------------
.../main/groovy/configure_elasticsearch.groovy | 2 +-
.../src/main/groovy/configure_usergrid.groovy | 6 +-
.../usergrid/persistence/queue/QueueFig.java | 3 +
.../persistence/queue/QueueScopeFactory.java | 34 +++++++++
.../persistence/queue/guice/QueueModule.java | 10 ++-
.../queue/impl/QueueScopeFactoryImpl.java | 47 ++++++++++++
.../queue/impl/SQSQueueManagerImpl.java | 76 +++++++++++---------
.../persistence/queue/QueueManagerTest.java | 27 +++++--
stack/loadtests/gatling/scripts/gatling-ug.sh | 6 ++
.../usergrid/rest/TextToJsonSwapWriter.java | 8 ++-
.../applications/ApplicationResourceIT.java | 2 -
.../usergrid/rest/management/AdminUsersIT.java | 6 --
.../notifications/ApplicationQueueManager.java | 1 -
.../notifications/NotificationsService.java | 5 +-
.../services/notifications/QueueListener.java | 5 +-
15 files changed, 183 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
[13/14] git commit: Changes from merging Ryan's changes in. Now auto
migrates and runs system setup
Posted by to...@apache.org.
Changes from merging Ryan's changes in. Now auto migrates and runs system setup
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/839f817f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/839f817f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/839f817f
Branch: refs/heads/key-row-sharding
Commit: 839f817f7d723d387c47672ea241b8a4d3b2cc04
Parents: 179bc18
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Nov 4 15:58:48 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Nov 4 15:58:48 2014 -0700
----------------------------------------------------------------------
stack/awscluster/pom.xml | 405 +++++++++++--------
.../main/dist/init_instance/init_rest_server.sh | 12 +
.../groovy/configure_opscenter_usergrid.groovy | 6 +-
stack/awscluster/ugcluster-cf.json | 18 +-
4 files changed, 249 insertions(+), 192 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/839f817f/stack/awscluster/pom.xml
----------------------------------------------------------------------
diff --git a/stack/awscluster/pom.xml b/stack/awscluster/pom.xml
index 9af3da6..4a8f4d6 100644
--- a/stack/awscluster/pom.xml
+++ b/stack/awscluster/pom.xml
@@ -1,186 +1,237 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>awscluster</artifactId>
- <groupId>org.usergrid</groupId>
- <version>1.0-SNAPSHOT</version>
-
- <name>awscluster</name>
-
- <description>
- Creates bundle for initializing a Tomcat and Cassandra Usergrid cluster via CloudFormation
- </description>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <aws.s3.release-bucket>usergrid-jenkins-builds</aws.s3.release-bucket>
- <stack.war>../rest/target/ROOT.war</stack.war>
- <portal.dir>../../portal/dist/usergrid-portal</portal.dir>
- </properties>
-
- <build>
-
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <phase>deploy</phase>
- <goals>
- <goal>java</goal>
- </goals>
- <id>upload-scripts</id>
- <configuration>
- <includeProjectDependencies>true</includeProjectDependencies>
- <includePluginDependencies>true</includePluginDependencies>
- <classpathScope>runtime</classpathScope>
- <executableDependency>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- </executableDependency>
- <mainClass>org.jets3t.apps.synchronize.Synchronize</mainClass>
- <arguments>
- <argument>--nodelete</argument>
- <argument>--properties</argument>
- <argument>${project.basedir}/aws.properties</argument>
- <argument>UP</argument>
- <argument>${aws.s3.release-bucket}</argument>
- <argument>${project.build.directory}/${project.build.finalName}-any.tar.gz</argument>
- </arguments>
- </configuration>
- </execution>
- <execution>
- <phase>deploy</phase>
- <goals>
- <goal>java</goal>
- </goals>
- <id>upload-war</id>
- <configuration>
- <includeProjectDependencies>true</includeProjectDependencies>
- <includePluginDependencies>true</includePluginDependencies>
- <classpathScope>runtime</classpathScope>
- <executableDependency>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- </executableDependency>
- <mainClass>org.jets3t.apps.synchronize.Synchronize</mainClass>
- <arguments>
- <argument>--nodelete</argument>
- <argument>--properties</argument>
- <argument>${project.basedir}/aws.properties</argument>
- <argument>UP</argument>
- <argument>${aws.s3.release-bucket}</argument>
- <argument>${stack.war}</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- <version>0.8.0</version>
- </dependency>
- </dependencies>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.1</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-eclipse-compiler</artifactId>
- <version>2.6.0-01</version>
- </dependency>
- </dependencies>
- <configuration>
- <compilerId>groovy-eclipse-compiler</compilerId>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>groovy-eclipse-compiler</artifactId>
- <groupId>org.codehaus.groovy</groupId>
- <version>2.6.0-01</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
-
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>synchronize</artifactId>
- <version>0.8.0</version>
- </dependency>
-
- <dependency>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>awscluster</artifactId>
+ <groupId>org.usergrid</groupId>
+ <version>1.0-SNAPSHOT</version>
+
+ <name>awscluster</name>
+
+ <description>
+ Creates bundle for initializing a Tomcat and Cassandra Usergrid cluster via CloudFormation
+ </description>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <aws.s3.release-bucket>ug-cloudformation</aws.s3.release-bucket>
+ <!-- Pulls the file path from maven when using the dependency plugin. This doesn't work b/c it doesn't name the file properly to ROOT.war. Solve that to use the latest from the repo-->
+ <!--<stack.war>${org.apache.usergrid:usergrid-rest:war}</stack.war>-->
+ <stack.war>../rest/target/ROOT.war</stack.war>
+ <portal.dir>../../portal/dist/usergrid-portal</portal.dir>
+ </properties>
+
+ <build>
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>assembly.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+
+ <!-- upload the tar file-->
+ <execution>
+ <phase>deploy</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <id>upload-scripts</id>
+ <configuration>
+ <includeProjectDependencies>true</includeProjectDependencies>
+ <includePluginDependencies>true</includePluginDependencies>
+ <classpathScope>runtime</classpathScope>
+ <executableDependency>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ </executableDependency>
+ <mainClass>org.jets3t.apps.synchronize.Synchronize</mainClass>
+ <arguments>
+ <argument>--nodelete</argument>
+ <argument>--properties</argument>
+ <argument>${project.basedir}/aws.properties</argument>
+ <argument>UP</argument>
+ <argument>${aws.s3.release-bucket}</argument>
+ <argument>${project.build.directory}/${project.build.finalName}-any.tar.gz</argument>
+ </arguments>
+ </configuration>
+ </execution>
+
+ <!-- upload the war file from our repository -->
+ <execution>
+ <phase>deploy</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <id>upload-war</id>
+ <configuration>
+ <includeProjectDependencies>true</includeProjectDependencies>
+ <includePluginDependencies>true</includePluginDependencies>
+ <classpathScope>runtime</classpathScope>
+ <executableDependency>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ </executableDependency>
+ <mainClass>org.jets3t.apps.synchronize.Synchronize</mainClass>
+ <arguments>
+ <argument>--nodelete</argument>
+ <argument>--properties</argument>
+ <argument>${project.basedir}/aws.properties</argument>
+ <argument>UP</argument>
+ <argument>${aws.s3.release-bucket}</argument>
+ <argument>${stack.war}</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
<version>0.8.0</version>
- </dependency>
-
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk</artifactId>
- <version>1.6.7</version>
- </dependency>
- <dependency>
- <artifactId>groovy-all</artifactId>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.8.1</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <dependencies>
+ <dependency>
<groupId>org.codehaus.groovy</groupId>
- <version>2.0.5</version>
- </dependency>
- </dependencies>
+ <artifactId>groovy-eclipse-compiler</artifactId>
+ <version>2.6.0-01</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <compilerId>groovy-eclipse-compiler</compilerId>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>groovy-eclipse-compiler</artifactId>
+ <groupId>org.codehaus.groovy</groupId>
+ <version>2.6.0-01</version>
+ <extensions>true</extensions>
+ </plugin>
+
+ <!-- Set the dependency path in the lifecycle for the property -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.9</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>properties</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- echo out the stack war -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <executable>echo</executable>
+ <arguments>
+ <argument>stack.war=</argument>
+ <argument>${stack.war}</argument>
+ </arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>synchronize</artifactId>
+ <version>0.8.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ <version>0.8.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.6.7</version>
+ </dependency>
+ <dependency>
+ <artifactId>groovy-all</artifactId>
+ <groupId>org.codehaus.groovy</groupId>
+ <version>2.0.5</version>
+ </dependency>
+
+ <!-- This dependency is used for deployment -->
+ <dependency>
+ <groupId>org.apache.usergrid</groupId>
+ <artifactId>usergrid-rest</artifactId>
+ <!-- Change this if you want to deploy a specific version, otherwise the latest in the repository will be used-->
+ <version>2.0.0-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/839f817f/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 0e65c9a..a255d31 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
@@ -200,6 +200,18 @@ apt-get install -y postfix
# Go
sh /etc/init.d/tomcat7 start
+#Wait for tomcat to start, then run our migrations
+
+
+#Wait until tomcat starts and we can hit our status page
+until curl -m 1 -I -X GET http://localhost:8080/status | grep "200 OK"; do sleep 5; done
+
+#Run the migration
+curl -X PUT http://ugtest.usergrid.com/system/migrate/run -u superuser:test
+
+#Run the system database setup
+curl -X GET http://localhost:8080/system/database/setup -u superuser:test
+
# tag last so we can see in the console that the script ran to completion
cd /usr/share/usergrid/scripts
groovy tag_instance.groovy
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/839f817f/stack/awscluster/src/main/groovy/configure_opscenter_usergrid.groovy
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/groovy/configure_opscenter_usergrid.groovy b/stack/awscluster/src/main/groovy/configure_opscenter_usergrid.groovy
index 150018c..df4dcae 100644
--- a/stack/awscluster/src/main/groovy/configure_opscenter_usergrid.groovy
+++ b/stack/awscluster/src/main/groovy/configure_opscenter_usergrid.groovy
@@ -48,9 +48,9 @@ def usergridConfig = """
seed_hosts = ${seeds}
#TODO, this doesn't seem to work, I think opscenter is broken. Try this again at a later time and remove opscenter exclusion below
-[storage_cassandra]
-seed_hosts = ${hostName}
-api_port = 9160
+#[storage_cassandra]
+#seed_hosts = ${hostName}
+#api_port = 9160
"""
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/839f817f/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json
index 087c67a..c8b96ee 100644
--- a/stack/awscluster/ugcluster-cf.json
+++ b/stack/awscluster/ugcluster-cf.json
@@ -15,7 +15,7 @@
"ReleaseBucket": {
"Description": "S3 Bucket where Usergrid assembly is to be found.",
"Type": "String",
- "Default": "usergrid-jenkins-builds"
+ "Default": "ug-cloudformation"
},
"RestMinServers": {
"Description": "Minimum number of REST servers.",
@@ -49,7 +49,7 @@
"KeyPair": {
"Description": "EC2 key pair to be use for SSH access",
"Type": "String",
- "Default": "jenkins-east"
+ "Default": "ug-cloudformation"
},
"CassClusterName": {
"Description": "Name to be used for Cassandra cluster.",
@@ -144,7 +144,7 @@
"OpsCenterInstanceType": {
"Description": "Instance type for Opscenter server",
"Type": "String",
- "Default": "c3.xlarge",
+ "Default": "c3.large",
"AllowedValues": [
"c3.large",
"c3.xlarge",
@@ -319,11 +319,9 @@
"apt-get update\n",
"apt-get -y install s3cmd\n",
"cd /usr/share/usergrid\n",
- "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/awscluster-1.0-SNAPSHOT-any.tar.gz\n",
- "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/ROOT.war\n",
+ "s3cmd --config=/etc/s3cfg get s3://", { "Ref":"ReleaseBucket" }, "/awscluster-1.0-SNAPSHOT-any.tar.gz\n",
"tar xvf awscluster-1.0-SNAPSHOT-any.tar.gz\n",
"rm -fr awscluster-1.0-SNAPSHOT-any.tar.gz\n",
- "mv ROOT.war webapps/ROOT.war\n",
"chmod 755 ./init_instance/*.sh\n",
"cd ./init_instance\n",
"# Init as a REST intance \n",
@@ -767,11 +765,9 @@
"apt-get update\n",
"apt-get -y install s3cmd\n",
"cd /usr/share/usergrid\n",
- "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/awscluster-1.0-SNAPSHOT-any.tar.gz\n",
- "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/ROOT.war\n",
+ "s3cmd --config=/etc/s3cfg get s3://", { "Ref":"ReleaseBucket" }, "/awscluster-1.0-SNAPSHOT-any.tar.gz\n",
"tar xvf awscluster-1.0-SNAPSHOT-any.tar.gz\n",
"rm -fr awscluster-1.0-SNAPSHOT-any.tar.gz\n",
- "mv ROOT.war webapps/ROOT.war\n",
"chmod 755 ./init_instance/*.sh\n",
"cd ./init_instance\n",
"# init as a Cassandra node \n",
@@ -930,11 +926,9 @@
"apt-get update\n",
"apt-get -y install s3cmd\n",
"cd /usr/share/usergrid\n",
- "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/awscluster-1.0-SNAPSHOT-any.tar.gz\n",
- "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/ROOT.war\n",
+ "s3cmd --config=/etc/s3cfg get s3://", { "Ref":"ReleaseBucket" }, "/awscluster-1.0-SNAPSHOT-any.tar.gz\n",
"tar xvf awscluster-1.0-SNAPSHOT-any.tar.gz\n",
"rm -fr awscluster-1.0-SNAPSHOT-any.tar.gz\n",
- "mv ROOT.war webapps/ROOT.war\n",
"chmod 755 ./init_instance/*.sh\n",
"cd ./init_instance\n",
"# init as an ES node \n",
[11/14] git commit: Moved opscenter into it's own node
Posted by to...@apache.org.
Moved opscenter into it's own node
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5fdbfa0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5fdbfa0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5fdbfa0d
Branch: refs/heads/key-row-sharding
Commit: 5fdbfa0d0d8475edd5506663ac412cd9147fa0a3
Parents: ac9740b
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Nov 4 09:43:36 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Nov 4 09:43:36 2014 -0700
----------------------------------------------------------------------
.../src/main/groovy/configure_elasticsearch.groovy | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5fdbfa0d/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy b/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
index 355bde2..6dec000 100644
--- a/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
+++ b/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
@@ -114,6 +114,21 @@ indices.recovery.max_bytes_per_sec: 40mb
# We want to turn on logging for slow queries and executions, so
###############
+index.search.slowlog.threshold.query.warn: 10s
+index.search.slowlog.threshold.query.info: 5s
+index.search.slowlog.threshold.query.debug: 2s
+index.search.slowlog.threshold.query.trace: 500ms
+
+index.search.slowlog.threshold.fetch.warn: 1s
+index.search.slowlog.threshold.fetch.info: 800ms
+index.search.slowlog.threshold.fetch.debug: 500ms
+index.search.slowlog.threshold.fetch.trace: 200ms
+
+
+index.indexing.slowlog.threshold.index.warn: 10s
+index.indexing.slowlog.threshold.index.info: 5s
+index.indexing.slowlog.threshold.index.debug: 2s
+index.indexing.slowlog.threshold.index.trace: 500ms
"""
[02/14] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into two-dot-o
Posted by to...@apache.org.
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4db5a0b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4db5a0b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4db5a0b4
Branch: refs/heads/key-row-sharding
Commit: 4db5a0b4c9ca2fffd9c39cce8e3139c52a0ba583
Parents: 46106a8 dbfb3db
Author: ryan bridges <rb...@apigee.com>
Authored: Tue Oct 7 14:54:32 2014 -0400
Committer: ryan bridges <rb...@apigee.com>
Committed: Tue Oct 7 14:54:32 2014 -0400
----------------------------------------------------------------------
stack/core/pom.xml | 15 +
.../CpEntityIndexDeleteListener.java | 23 +-
.../corepersistence/CpEntityManager.java | 45 ++-
.../corepersistence/CpEntityManagerFactory.java | 5 +-
.../corepersistence/CpManagerCache.java | 29 +-
.../usergrid/corepersistence/GuiceModule.java | 12 +-
.../collection/event/EntityDeleted.java | 17 +
.../collection/event/EntityVersionCreated.java | 17 +
.../collection/event/EntityVersionDeleted.java | 17 +
.../core/util/AvailablePortFinder.java | 188 -----------
stack/corepersistence/map/pom.xml | 81 +++++
.../usergrid/persistence/map/MapManager.java | 68 ++++
.../persistence/map/MapManagerFactory.java | 30 ++
.../usergrid/persistence/map/MapScope.java | 40 +++
.../persistence/map/guice/MapModule.java | 61 ++++
.../persistence/map/impl/MapManagerImpl.java | 90 +++++
.../persistence/map/impl/MapScopeImpl.java | 90 +++++
.../persistence/map/impl/MapSerialization.java | 64 ++++
.../map/impl/MapSerializationImpl.java | 337 +++++++++++++++++++
.../persistence/map/MapManagerTest.java | 206 ++++++++++++
.../persistence/map/guice/TestMapModule.java | 16 +
stack/corepersistence/pom.xml | 18 +
.../index/impl/EsEntityIndexImpl.java | 208 ++++++------
stack/corepersistence/queue/pom.xml | 92 +++++
.../usergrid/persistence/queue/Queue.java | 31 ++
.../usergrid/persistence/queue/QueueFig.java | 16 +
.../persistence/queue/QueueManager.java | 64 ++++
.../persistence/queue/QueueManagerFactory.java | 23 ++
.../persistence/queue/QueueMessage.java | 42 +++
.../usergrid/persistence/queue/QueueScope.java | 31 ++
.../persistence/queue/guice/QueueModule.java | 51 +++
.../persistence/queue/impl/QueueScopeImpl.java | 87 +++++
.../queue/impl/SQSQueueManagerImpl.java | 234 +++++++++++++
.../persistence/queue/QueueManagerTest.java | 100 ++++++
.../queue/guice/TestQueueModule.java | 33 ++
stack/pom.xml | 8 +-
.../apache/usergrid/rest/SystemResource.java | 67 +++-
.../notifications/ApplicationQueueManager.java | 108 +++---
.../notifications/ApplicationQueueMessage.java | 67 ++--
.../notifications/NotificationsService.java | 16 +-
.../services/notifications/QueueListener.java | 81 +++--
.../services/notifications/QueueManager.java | 31 --
.../services/notifications/TaskManager.java | 65 ++--
.../usergrid/services/TestQueueManager.java | 67 ++++
.../AbstractServiceNotificationIT.java | 1 -
.../apns/NotificationsServiceIT.java | 56 +--
.../gcm/NotificationsServiceIT.java | 9 +-
stack/test-utils/pom.xml | 17 +-
.../java/org/apache/usergrid/tools/ApiDoc.java | 5 +-
49 files changed, 2494 insertions(+), 585 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4db5a0b4/stack/pom.xml
----------------------------------------------------------------------
[10/14] git commit: Temp commit, overwrite
Posted by to...@apache.org.
Temp commit, overwrite
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ac9740ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ac9740ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ac9740ba
Branch: refs/heads/key-row-sharding
Commit: ac9740ba4a72825fe0753556f0450314b8c3f973
Parents: 74e365a
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Nov 4 09:41:44 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Nov 4 09:41:44 2014 -0700
----------------------------------------------------------------------
.../main/groovy/configure_elasticsearch.groovy | 32 ++++++++++++++------
.../groovy/configure_opscenter_usergrid.groovy | 6 ++--
.../src/main/groovy/configure_usergrid.groovy | 5 ++-
3 files changed, 29 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ac9740ba/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy b/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
index cd91026..355bde2 100644
--- a/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
+++ b/stack/awscluster/src/main/groovy/configure_elasticsearch.groovy
@@ -62,15 +62,19 @@ es.logger.level: INFO
#Set our threadpool size. Our bulk pool and search pools are quite large. We may want to turn these down if we
#overload the system
-threadpool.index.type: fixed
-threadpool.index.size: 160
-threadpool.index.queue_size: 0
-threadpool.bulk.type: fixed
-threadpool.bulk.size: 1000
-threadpool.bulk.queue_size: 0
-threadpool.search.size: 10000
-threadpool.search.type: fixed
-threadpool.search.queue_size: 0
+threadpool:
+ index:
+ type: fixed
+ size: 160
+ queue_size: 0
+ bulk:
+ type: fixed
+ size: 5000
+ queue_size: 100
+ search:
+ size: 10000
+ type: fixed
+ queue_size: 100
action.auto_create_index: false
@@ -88,7 +92,7 @@ bootstrap.mlockall: true
indices.fielddata.cache.size: 25%
#If you haven't used it in 10 minutes, evict it from the cache
-indices.fielddata.cache.expire: 10m
+#indices.fielddata.cache.expire: 10m
#Only allow rebalancing of 2 shards at a time
cluster.routing.allocation.cluster_concurrent_rebalance: 2
@@ -104,6 +108,14 @@ cluster.routing.allocation.node_initial_primaries_recoveries: 18
indices.recovery.concurrent_streams: 4
indices.recovery.max_bytes_per_sec: 40mb
+
+###############
+# Logging options
+# We want to turn on logging for slow queries and executions, so
+###############
+
+
+
"""
println elasticSearchConfig
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ac9740ba/stack/awscluster/src/main/groovy/configure_opscenter_usergrid.groovy
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/groovy/configure_opscenter_usergrid.groovy b/stack/awscluster/src/main/groovy/configure_opscenter_usergrid.groovy
index df4dcae..150018c 100644
--- a/stack/awscluster/src/main/groovy/configure_opscenter_usergrid.groovy
+++ b/stack/awscluster/src/main/groovy/configure_opscenter_usergrid.groovy
@@ -48,9 +48,9 @@ def usergridConfig = """
seed_hosts = ${seeds}
#TODO, this doesn't seem to work, I think opscenter is broken. Try this again at a later time and remove opscenter exclusion below
-#[storage_cassandra]
-#seed_hosts = ${hostName}
-#api_port = 9160
+[storage_cassandra]
+seed_hosts = ${hostName}
+api_port = 9160
"""
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ac9740ba/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 bbbcd41..d18c995 100644
--- a/stack/awscluster/src/main/groovy/configure_usergrid.groovy
+++ b/stack/awscluster/src/main/groovy/configure_usergrid.groovy
@@ -41,7 +41,10 @@ def superUserEmail = System.getenv().get("SUPER_USER_EMAIL")
def testAdminUserEmail = System.getenv().get("TEST_ADMIN_USER_EMAIL")
def numEsNodes = Integer.parseInt(System.getenv().get("ES_NUM_SERVERS"))
-def esShards = numEsNodes/2;
+//Override number of shards. Set it to 2x the cluster size
+def esShards = numEsNodes*2;
+
+
def esReplicas = 2;
def cassThreads = System.getenv().get("TOMCAT_THREADS")
[07/14] git commit: [APIBAAS-1362]Remove war file from the assembly
artifact and have maven upload them separately
Posted by to...@apache.org.
[APIBAAS-1362]Remove war file from the assembly artifact and have maven upload them separately
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/036a5c01
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/036a5c01
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/036a5c01
Branch: refs/heads/key-row-sharding
Commit: 036a5c0115562c3b6e8aa6cf0dfe5ccf4ff25c01
Parents: 578ce4f
Author: ryan bridges <rb...@apigee.com>
Authored: Tue Nov 4 10:59:40 2014 -0500
Committer: ryan bridges <rb...@apigee.com>
Committed: Tue Nov 4 10:59:40 2014 -0500
----------------------------------------------------------------------
stack/awscluster/assembly.xml | 8 ++---
stack/awscluster/pom.xml | 66 ++++++++++++++++++++++++++------------
2 files changed, 50 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/036a5c01/stack/awscluster/assembly.xml
----------------------------------------------------------------------
diff --git a/stack/awscluster/assembly.xml b/stack/awscluster/assembly.xml
index aefa650..a0fc0aa 100644
--- a/stack/awscluster/assembly.xml
+++ b/stack/awscluster/assembly.xml
@@ -24,15 +24,15 @@
<includeBaseDirectory>false</includeBaseDirectory>
- <files>
+ <!-- <files>
<file>
- <outputDirectory>webapps</outputDirectory>
+ <outputDirectory>webapps</outputDirectory>
<source>${stack.war}</source>
- <destName>ROOT.war</destName>
+ <destName>ROOT.war</destName>
</file>
- </files>
+ </files> -->
<fileSets>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/036a5c01/stack/awscluster/pom.xml
----------------------------------------------------------------------
diff --git a/stack/awscluster/pom.xml b/stack/awscluster/pom.xml
index 049415d..9af3da6 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>ug-cloudformation</aws.s3.release-bucket>
+ <aws.s3.release-bucket>usergrid-jenkins-builds</aws.s3.release-bucket>
<stack.war>../rest/target/ROOT.war</stack.war>
<portal.dir>../../portal/dist/usergrid-portal</portal.dir>
</properties>
@@ -69,26 +69,52 @@
<goals>
<goal>java</goal>
</goals>
+ <id>upload-scripts</id>
+ <configuration>
+ <includeProjectDependencies>true</includeProjectDependencies>
+ <includePluginDependencies>true</includePluginDependencies>
+ <classpathScope>runtime</classpathScope>
+ <executableDependency>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ </executableDependency>
+ <mainClass>org.jets3t.apps.synchronize.Synchronize</mainClass>
+ <arguments>
+ <argument>--nodelete</argument>
+ <argument>--properties</argument>
+ <argument>${project.basedir}/aws.properties</argument>
+ <argument>UP</argument>
+ <argument>${aws.s3.release-bucket}</argument>
+ <argument>${project.build.directory}/${project.build.finalName}-any.tar.gz</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <phase>deploy</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <id>upload-war</id>
+ <configuration>
+ <includeProjectDependencies>true</includeProjectDependencies>
+ <includePluginDependencies>true</includePluginDependencies>
+ <classpathScope>runtime</classpathScope>
+ <executableDependency>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ </executableDependency>
+ <mainClass>org.jets3t.apps.synchronize.Synchronize</mainClass>
+ <arguments>
+ <argument>--nodelete</argument>
+ <argument>--properties</argument>
+ <argument>${project.basedir}/aws.properties</argument>
+ <argument>UP</argument>
+ <argument>${aws.s3.release-bucket}</argument>
+ <argument>${stack.war}</argument>
+ </arguments>
+ </configuration>
</execution>
</executions>
- <configuration>
- <includeProjectDependencies>true</includeProjectDependencies>
- <includePluginDependencies>true</includePluginDependencies>
- <classpathScope>runtime</classpathScope>
- <executableDependency>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- </executableDependency>
- <mainClass>org.jets3t.apps.synchronize.Synchronize</mainClass>
- <arguments>
- <argument>--nodelete</argument>
- <argument>--properties</argument>
- <argument>${project.basedir}/aws.properties</argument>
- <argument>UP</argument>
- <argument>${aws.s3.release-bucket}</argument>
- <argument>${project.build.directory}/${project.build.finalName}-any.tar.gz</argument>
- </arguments>
- </configuration>
<dependencies>
<dependency>
<groupId>net.java.dev.jets3t</groupId>
@@ -143,7 +169,7 @@
<artifactId>jets3t</artifactId>
<version>0.8.0</version>
</dependency>
-
+
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
[03/14] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into two-dot-o
Posted by to...@apache.org.
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into two-dot-o
Conflicts:
stack/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2aa09538
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2aa09538
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2aa09538
Branch: refs/heads/key-row-sharding
Commit: 2aa09538c5f616405733523d243da898dda1e7e3
Parents: 4db5a0b 3f4825c
Author: ryan bridges <rb...@apigee.com>
Authored: Wed Oct 22 15:37:36 2014 -0400
Committer: ryan bridges <rb...@apigee.com>
Committed: Wed Oct 22 15:37:36 2014 -0400
----------------------------------------------------------------------
portal/js/global/ug-service.js | 2 +-
portal/js/push/push-history.html | 8 +-
.../push/push-send-notification-controller.js | 44 +-
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 | 28 +-
.../src/main/dist/init_instance/create_raid0.sh | 19 +-
.../dist/init_instance/create_raid0_2disks.sh | 54 -
.../src/main/dist/init_instance/init_cass.sh | 70 -
.../main/dist/init_instance/init_db_server.sh | 11 +-
.../main/dist/init_instance/init_es_server.sh | 67 +
.../dist/init_instance/init_graphite_server.sh | 11 +-
.../main/dist/init_instance/init_rest_server.sh | 24 +
.../dist/init_instance/install_cassandra.sh | 6 +-
.../dist/init_instance/install_elasticsearch.sh | 22 +-
.../init_instance/install_opscenter_agent.sh | 1 +
.../main/dist/init_instance/install_yourkit.sh | 6 +-
.../src/main/groovy/configure_cassandra.groovy | 26 +-
.../main/groovy/configure_elasticsearch.groovy | 26 +-
.../src/main/groovy/configure_usergrid.groovy | 22 +-
.../src/main/groovy/tag_instance.groovy | 10 +-
stack/awscluster/ugcluster-cf.json | 345 +++-
.../main/resources/usergrid-default.properties | 2 +-
stack/core/pom.xml | 21 -
.../corepersistence/CpEntityDeleteListener.java | 2 +-
.../corepersistence/CpEntityManager.java | 457 ++----
.../corepersistence/CpEntityManagerFactory.java | 220 ++-
.../corepersistence/CpEntityMapUtils.java | 323 ----
.../corepersistence/CpManagerCache.java | 2 +-
.../usergrid/corepersistence/CpNamingUtils.java | 106 --
.../corepersistence/CpRelationManager.java | 1553 ++++++++----------
.../usergrid/corepersistence/CpSetup.java | 3 +
.../usergrid/corepersistence/CpVisitor.java | 35 +
.../usergrid/corepersistence/CpWalker.java | 128 ++
.../corepersistence/results/EntityVerifier.java | 127 ++
.../results/FilteringLoader.java | 249 +++
.../corepersistence/results/IdsVerifier.java | 46 +
.../corepersistence/results/RefsVerifier.java | 42 +
.../corepersistence/results/ResultsLoader.java | 43 +
.../results/ResultsLoaderFactory.java | 39 +
.../results/ResultsLoaderFactoryImpl.java | 67 +
.../results/ResultsVerifier.java | 54 +
.../results/VersionVerifier.java | 81 +
.../corepersistence/util/CpEntityMapUtils.java | 323 ++++
.../corepersistence/util/CpNamingUtils.java | 106 ++
.../apache/usergrid/metrics/MetricsFactory.java | 21 +-
.../usergrid/persistence/EntityManager.java | 9 +-
.../persistence/EntityManagerFactory.java | 8 +-
.../apache/usergrid/persistence/Results.java | 6 +-
.../cassandra/EntityManagerImpl.java | 12 +
.../persistence/entities/Notification.java | 13 +
.../usergrid/batch/job/SchedulerRuntime8IT.java | 3 +
.../CpEntityDeleteListenerTest.java | 2 +-
.../CpEntityIndexDeleteListenerTest.java | 3 +-
.../corepersistence/CpEntityMapUtilsTest.java | 2 +
.../corepersistence/StaleIndexCleanupTest.java | 249 +++
.../PerformanceEntityRebuildIndexTest.java | 36 +-
.../query/AbstractIteratingQueryIT.java | 3 +
.../collection/EntityCollectionManager.java | 23 +
.../persistence/collection/EntitySet.java | 47 +
.../persistence/collection/MvccEntity.java | 68 +
.../persistence/collection/MvccLogEntry.java | 94 ++
.../persistence/collection/VersionSet.java | 67 +
.../exception/CollectionRuntimeException.java | 2 +-
.../exception/WriteCommitException.java | 4 +-
.../WriteOptimisticVerifyException.java | 4 +-
.../exception/WriteStartException.java | 4 +-
.../exception/WriteUniqueVerifyException.java | 3 +-
.../collection/guice/CollectionModule.java | 19 +-
.../impl/EntityCollectionManagerImpl.java | 257 ++-
.../impl/EntityVersionCleanupTask.java | 2 +-
.../mvcc/MvccEntitySerializationStrategy.java | 20 +-
.../mvcc/MvccLogEntrySerializationStrategy.java | 17 +-
.../collection/mvcc/changelog/ChangeLog.java | 68 +
.../mvcc/changelog/ChangeLogEntry.java | 104 --
.../mvcc/changelog/ChangeLogGenerator.java | 16 +-
.../mvcc/changelog/ChangeLogGeneratorImpl.java | 138 +-
.../mvcc/changelog/ChangeLogImpl.java | 135 ++
.../collection/mvcc/entity/MvccEntity.java | 68 -
.../collection/mvcc/entity/MvccLogEntry.java | 93 --
.../mvcc/entity/MvccValidationUtils.java | 4 +
.../mvcc/entity/impl/MvccEntityDeleteEvent.java | 2 +-
.../mvcc/entity/impl/MvccEntityEvent.java | 2 +-
.../mvcc/entity/impl/MvccEntityImpl.java | 2 +-
.../mvcc/entity/impl/MvccEntityWriteEvent.java | 3 +-
.../mvcc/entity/impl/MvccLogEntryImpl.java | 2 +-
.../mvcc/event/PostProcessObserver.java | 39 -
.../mvcc/stage/EntityUpdateEvent.java | 1 -
.../mvcc/stage/delete/MarkCommit.java | 157 +-
.../collection/mvcc/stage/delete/MarkStart.java | 4 +-
.../collection/mvcc/stage/load/Load.java | 98 --
.../mvcc/stage/write/EntityVersion.java | 64 -
.../stage/write/EntityVersionSerializer.java | 71 -
.../mvcc/stage/write/FieldSerializer.java | 107 --
.../mvcc/stage/write/RollbackAction.java | 9 +-
.../mvcc/stage/write/UniqueValue.java | 39 -
.../mvcc/stage/write/UniqueValueImpl.java | 124 --
.../write/UniqueValueSerializationStrategy.java | 66 -
.../UniqueValueSerializationStrategyImpl.java | 194 ---
.../mvcc/stage/write/WriteCommit.java | 18 +-
.../mvcc/stage/write/WriteOptimisticVerify.java | 52 +-
.../collection/mvcc/stage/write/WriteStart.java | 17 +-
.../mvcc/stage/write/WriteUniqueVerify.java | 209 ++-
.../collection/serialization/EntityRepair.java | 38 +
.../serialization/OptimisticUpdate.java | 2 +-
.../serialization/SerializationFig.java | 19 +
.../collection/serialization/UniqueValue.java | 49 +
.../UniqueValueSerializationStrategy.java | 68 +
.../serialization/UniqueValueSet.java | 32 +
.../serialization/impl/EntityRepairImpl.java | 149 ++
.../serialization/impl/EntitySetImpl.java | 62 +
.../serialization/impl/EntityVersion.java | 64 +
.../impl/EntityVersionSerializer.java | 81 +
.../serialization/impl/FieldSerializer.java | 118 ++
.../serialization/impl/LogEntryIterator.java | 2 +-
.../MvccEntitySerializationStrategyImpl.java | 175 +-
.../MvccLogEntrySerializationStrategyImpl.java | 129 +-
.../serialization/impl/SerializationModule.java | 3 +-
.../serialization/impl/UniqueValueImpl.java | 114 ++
.../UniqueValueSerializationStrategyImpl.java | 229 +++
.../serialization/impl/UniqueValueSetImpl.java | 85 +
.../serialization/impl/VersionSetImpl.java | 80 +
.../persistence/collection/util/RepairUtil.java | 138 --
.../collection/EntityCollectionManagerIT.java | 431 ++++-
.../changelog/ChangeLogGeneratorImplTest.java | 375 +++--
.../mvcc/entity/impl/MvccEntityImplTest.java | 2 +-
.../mvcc/entity/impl/MvccLogEntryImplTest.java | 2 +-
.../mvcc/stage/AbstractMvccEntityStageTest.java | 2 +-
.../mvcc/stage/TestEntityGenerator.java | 2 +-
.../mvcc/stage/delete/MarkCommitTest.java | 12 +-
.../mvcc/stage/delete/MarkStartTest.java | 4 +-
.../collection/mvcc/stage/load/LoadTest.java | 361 ----
.../write/EntityVersionSerializerTest.java | 2 +
.../mvcc/stage/write/FieldSerializerTest.java | 1 +
...niqueValueSerializationStrategyImplTest.java | 119 +-
.../mvcc/stage/write/WriteCommitTest.java | 5 +-
.../stage/write/WriteOptimisticVerifyTest.java | 35 +-
.../mvcc/stage/write/WriteStartTest.java | 4 +-
.../stage/write/WriteUniqueVerifyStageTest.java | 48 -
.../mvcc/stage/write/WriteUniqueVerifyTest.java | 58 +-
.../serialization/EntityRepairImplTest.java | 147 ++
.../impl/LogEntryIteratorTest.java | 2 +-
...MvccEntitySerializationStrategyImplTest.java | 40 +-
.../impl/MvccLESSTransientTest.java | 7 +-
...ccLogEntrySerializationStrategyImplTest.java | 19 +-
.../util/InvalidMvccEntityGenerator.java | 2 +-
.../util/InvalidValueGeneratorTest.java | 2 +-
.../collection/util/LogEntryMock.java | 4 +-
stack/corepersistence/common/pom.xml | 13 +-
.../persistence/model/field/AbstractField.java | 4 +
.../persistence/model/field/ArrayField.java | 3 +
.../persistence/model/field/BooleanField.java | 6 +
.../persistence/model/field/ByteArrayField.java | 6 +
.../persistence/model/field/DoubleField.java | 6 +
.../model/field/EntityObjectField.java | 6 +
.../usergrid/persistence/model/field/Field.java | 8 +
.../persistence/model/field/FieldTypeName.java | 42 +
.../persistence/model/field/FloatField.java | 6 +
.../persistence/model/field/IntegerField.java | 6 +
.../persistence/model/field/ListField.java | 7 +
.../persistence/model/field/LocationField.java | 6 +
.../persistence/model/field/LongField.java | 6 +
.../persistence/model/field/SetField.java | 6 +
.../persistence/model/field/StringField.java | 6 +
.../persistence/model/field/UUIDField.java | 6 +
stack/corepersistence/pom.xml | 5 +-
.../usergrid/persistence/index/EntityIndex.java | 6 +
.../persistence/index/EntityIndexBatch.java | 3 +
.../index/impl/EsEntityIndexBatchImpl.java | 121 +-
.../index/impl/EsEntityIndexImpl.java | 384 +++--
.../persistence/index/impl/EsProvider.java | 21 +-
.../persistence/index/impl/IndexScopeImpl.java | 37 +
.../persistence/index/impl/IndexingUtils.java | 66 +
.../index/query/CandidateResult.java | 30 +
.../persistence/index/impl/EntityIndexTest.java | 5 +
stack/corepersistence/queue/pom.xml | 8 +-
.../usergrid/persistence/queue/Queue.java | 4 +
.../queue/impl/SQSQueueManagerImpl.java | 131 +-
stack/loadtests/README.md | 53 +
stack/loadtests/gatling/LICENSE | 202 +++
stack/loadtests/gatling/conf/application.conf | 21 +
stack/loadtests/gatling/conf/gatling.conf | 162 ++
stack/loadtests/gatling/conf/logback.xml | 35 +
stack/loadtests/gatling/conf/recorder.conf | 51 +
.../gatling/lib/Saxon-HE-9.5.1-6-compressed.jar | Bin 0 -> 3813075 bytes
.../gatling/lib/akka-actor_2.10-2.3.6.jar | Bin 0 -> 2583959 bytes
.../lib/async-http-client-1.9.0-BETA13.jar | Bin 0 -> 579954 bytes
stack/loadtests/gatling/lib/boon-0.26.jar | Bin 0 -> 1026950 bytes
.../loadtests/gatling/lib/commons-pool-1.6.jar | Bin 0 -> 111119 bytes
.../lib/compiler-interface-0.13.5-sources.jar | Bin 0 -> 30056 bytes
.../lib/concurrentlinkedhashmap-lru-1.4.jar | Bin 0 -> 116575 bytes
stack/loadtests/gatling/lib/config-1.2.1.jar | Bin 0 -> 219554 bytes
.../gatling/lib/fastring_2.10-0.2.4.jar | Bin 0 -> 98640 bytes
.../gatling/lib/gatling-app-2.0.0-RC5.jar | Bin 0 -> 73052 bytes
.../gatling/lib/gatling-charts-2.0.0-RC5.jar | Bin 0 -> 500609 bytes
.../lib/gatling-charts-highcharts-2.0.0-RC5.jar | Bin 0 -> 214683 bytes
.../gatling/lib/gatling-core-2.0.0-RC5.jar | Bin 0 -> 1678475 bytes
.../gatling/lib/gatling-http-2.0.0-RC5.jar | Bin 0 -> 1222752 bytes
.../gatling/lib/gatling-jdbc-2.0.0-RC5.jar | Bin 0 -> 41648 bytes
.../gatling/lib/gatling-jms-2.0.0-RC5.jar | Bin 0 -> 174279 bytes
.../gatling/lib/gatling-metrics-2.0.0-RC5.jar | Bin 0 -> 72446 bytes
.../gatling/lib/gatling-recorder-2.0.0-RC5.jar | Bin 0 -> 815471 bytes
.../gatling/lib/gatling-redis-2.0.0-RC5.jar | Bin 0 -> 19970 bytes
.../gatling/lib/geronimo-jms_1.1_spec-1.1.1.jar | Bin 0 -> 32359 bytes
.../gatling/lib/incremental-compiler-0.13.5.jar | Bin 0 -> 2214694 bytes
.../gatling/lib/jackson-annotations-2.4.0.jar | Bin 0 -> 38605 bytes
.../gatling/lib/jackson-core-2.4.2.jar | Bin 0 -> 225316 bytes
.../gatling/lib/jackson-databind-2.4.2.jar | Bin 0 -> 1075759 bytes
stack/loadtests/gatling/lib/jodd-core-3.6.jar | Bin 0 -> 373882 bytes
.../loadtests/gatling/lib/jodd-lagarto-3.6.jar | Bin 0 -> 204738 bytes
stack/loadtests/gatling/lib/jodd-log-3.6.jar | Bin 0 -> 14547 bytes
.../gatling/lib/jsonpath_2.10-0.5.0.jar | Bin 0 -> 180090 bytes
stack/loadtests/gatling/lib/jzlib-1.1.3.jar | Bin 0 -> 71976 bytes
.../gatling/lib/logback-classic-1.1.2.jar | Bin 0 -> 270750 bytes
.../gatling/lib/logback-core-1.1.2.jar | Bin 0 -> 427729 bytes
.../loadtests/gatling/lib/netty-3.9.4.Final.jar | Bin 0 -> 1310154 bytes
stack/loadtests/gatling/lib/opencsv-2.3.jar | Bin 0 -> 19827 bytes
.../gatling/lib/redisclient_2.10-2.13.jar | Bin 0 -> 712616 bytes
.../gatling/lib/sbt-interface-0.13.5.jar | Bin 0 -> 52012 bytes
stack/loadtests/gatling/lib/scala-compiler.jar | Bin 0 -> 14445780 bytes
stack/loadtests/gatling/lib/scala-library.jar | Bin 0 -> 7126372 bytes
stack/loadtests/gatling/lib/scala-reflect.jar | Bin 0 -> 3203471 bytes
.../gatling/lib/scala-swing-2.10.4.jar | Bin 0 -> 707298 bytes
.../lib/scalalogging-slf4j_2.10-1.1.0.jar | Bin 0 -> 79003 bytes
.../loadtests/gatling/lib/scopt_2.10-3.2.0.jar | Bin 0 -> 122918 bytes
stack/loadtests/gatling/lib/slf4j-api-1.7.7.jar | Bin 0 -> 29257 bytes
stack/loadtests/gatling/lib/t-digest-3.0.jar | Bin 0 -> 49754 bytes
stack/loadtests/gatling/lib/threetenbp-1.0.jar | Bin 0 -> 507797 bytes
.../gatling/lib/uncommons-maths-1.2.3.jar | Bin 0 -> 49923 bytes
stack/loadtests/gatling/lib/zinc-0.3.5.3.jar | Bin 0 -> 392810 bytes
stack/loadtests/gatling/scripts/gatling-ug.sh | 43 +
.../gatling/user-files/data/search.csv | 3 +
.../gatling/user-files/request-bodies/.keep | 0
stack/loadtests/loadtest_setup.sh | 45 +
.../data-generators/EntityDataGenerator.scala | 57 +
.../data-generators/FeederGenerator.scala | 101 ++
.../scenarios/ApplicationScenarios.scala | 45 +
.../scenarios/ConnectionScenarios.scala | 30 +
.../usergrid/scenarios/DeviceScenarios.scala | 65 +
.../usergrid/scenarios/GeoScenarios.scala | 43 +
.../scenarios/NotificationScenarios.scala | 71 +
.../usergrid/scenarios/NotifierScenarios.scala | 65 +
.../scenarios/OrganizationScenarios.scala | 42 +
.../usergrid/scenarios/TokenScenarios.scala | 59 +
.../usergrid/scenarios/UserScenarios.scala | 50 +
.../org/apache/usergrid/settings/Headers.scala | 43 +
.../org/apache/usergrid/settings/Settings.scala | 54 +
.../org/apache/usergrid/settings/Utils.scala | 87 +
.../simulations/GetEntitySimulation.scala | 41 +
.../simulations/PostDevicesSimulation.scala | 42 +
.../simulations/PostUsersSimulation.scala | 47 +
.../PushTargetDeviceSimulation.scala | 53 +
.../simulations/PushTargetUserSimulation.scala | 68 +
stack/pom.xml | 36 +-
.../apache/usergrid/rest/SystemResource.java | 74 +-
stack/rest/src/main/webapp/WEB-INF/web.xml | 2 +-
.../usergrid/rest/management/AccessTokenIT.java | 381 +++--
.../cassandra/ManagementServiceImpl.java | 38 +-
.../usergrid/services/ServiceManager.java | 7 +-
.../services/devices/DevicesService.java | 55 +-
.../notifications/ApplicationQueueManager.java | 17 +-
.../notifications/NotificationsService.java | 9 +-
.../services/notifications/QueueListener.java | 10 +-
.../services/notifications/TaskManager.java | 105 +-
.../services/users/devices/DevicesService.java | 33 +
.../cassandra/ManagementServiceIT.java | 2 +-
.../usergrid/services/TestQueueManager.java | 4 +-
.../AbstractServiceNotificationIT.java | 10 +-
.../notifications/NotifiersServiceIT.java | 1 +
.../apns/NotificationsServiceIT.java | 186 ++-
.../gcm/NotificationsServiceIT.java | 172 +-
.../src/test/resources/log4j.properties | 4 +
273 files changed, 9585 insertions(+), 5776 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2aa09538/stack/pom.xml
----------------------------------------------------------------------
[05/14] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into two-dot-o
Posted by to...@apache.org.
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4ae64722
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4ae64722
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4ae64722
Branch: refs/heads/key-row-sharding
Commit: 4ae64722453309df5b40f8e6af2bc3c24acaa4e2
Parents: dafb27e 960ce6b
Author: ryan bridges <rb...@apigee.com>
Authored: Tue Oct 28 11:18:54 2014 -0400
Committer: ryan bridges <rb...@apigee.com>
Committed: Tue Oct 28 11:18:54 2014 -0400
----------------------------------------------------------------------
stack/loadtests/README.md | 52 -----
stack/loadtests/gatling/LICENSE | 202 -------------------
stack/loadtests/gatling/conf/application.conf | 21 --
stack/loadtests/gatling/conf/gatling.conf | 162 ---------------
stack/loadtests/gatling/conf/logback.xml | 35 ----
stack/loadtests/gatling/conf/recorder.conf | 51 -----
.../gatling/lib/Saxon-HE-9.5.1-6-compressed.jar | Bin 3813075 -> 0 bytes
.../gatling/lib/akka-actor_2.10-2.3.6.jar | Bin 2583959 -> 0 bytes
.../lib/async-http-client-1.9.0-BETA13.jar | Bin 579954 -> 0 bytes
stack/loadtests/gatling/lib/boon-0.26.jar | Bin 1026950 -> 0 bytes
.../loadtests/gatling/lib/commons-pool-1.6.jar | Bin 111119 -> 0 bytes
.../lib/compiler-interface-0.13.5-sources.jar | Bin 30056 -> 0 bytes
.../lib/concurrentlinkedhashmap-lru-1.4.jar | Bin 116575 -> 0 bytes
stack/loadtests/gatling/lib/config-1.2.1.jar | Bin 219554 -> 0 bytes
.../gatling/lib/fastring_2.10-0.2.4.jar | Bin 98640 -> 0 bytes
.../gatling/lib/gatling-app-2.0.0-RC5.jar | Bin 73052 -> 0 bytes
.../gatling/lib/gatling-charts-2.0.0-RC5.jar | Bin 500609 -> 0 bytes
.../lib/gatling-charts-highcharts-2.0.0-RC5.jar | Bin 214683 -> 0 bytes
.../gatling/lib/gatling-core-2.0.0-RC5.jar | Bin 1678475 -> 0 bytes
.../gatling/lib/gatling-http-2.0.0-RC5.jar | Bin 1222752 -> 0 bytes
.../gatling/lib/gatling-jdbc-2.0.0-RC5.jar | Bin 41648 -> 0 bytes
.../gatling/lib/gatling-jms-2.0.0-RC5.jar | Bin 174279 -> 0 bytes
.../gatling/lib/gatling-metrics-2.0.0-RC5.jar | Bin 72446 -> 0 bytes
.../gatling/lib/gatling-recorder-2.0.0-RC5.jar | Bin 815471 -> 0 bytes
.../gatling/lib/gatling-redis-2.0.0-RC5.jar | Bin 19970 -> 0 bytes
.../gatling/lib/geronimo-jms_1.1_spec-1.1.1.jar | Bin 32359 -> 0 bytes
.../gatling/lib/incremental-compiler-0.13.5.jar | Bin 2214694 -> 0 bytes
.../gatling/lib/jackson-annotations-2.4.0.jar | Bin 38605 -> 0 bytes
.../gatling/lib/jackson-core-2.4.2.jar | Bin 225316 -> 0 bytes
.../gatling/lib/jackson-databind-2.4.2.jar | Bin 1075759 -> 0 bytes
stack/loadtests/gatling/lib/jodd-core-3.6.jar | Bin 373882 -> 0 bytes
.../loadtests/gatling/lib/jodd-lagarto-3.6.jar | Bin 204738 -> 0 bytes
stack/loadtests/gatling/lib/jodd-log-3.6.jar | Bin 14547 -> 0 bytes
.../gatling/lib/jsonpath_2.10-0.5.0.jar | Bin 180090 -> 0 bytes
stack/loadtests/gatling/lib/jzlib-1.1.3.jar | Bin 71976 -> 0 bytes
.../gatling/lib/logback-classic-1.1.2.jar | Bin 270750 -> 0 bytes
.../gatling/lib/logback-core-1.1.2.jar | Bin 427729 -> 0 bytes
.../loadtests/gatling/lib/netty-3.9.4.Final.jar | Bin 1310154 -> 0 bytes
stack/loadtests/gatling/lib/opencsv-2.3.jar | Bin 19827 -> 0 bytes
.../gatling/lib/redisclient_2.10-2.13.jar | Bin 712616 -> 0 bytes
.../gatling/lib/sbt-interface-0.13.5.jar | Bin 52012 -> 0 bytes
stack/loadtests/gatling/lib/scala-compiler.jar | Bin 14445780 -> 0 bytes
stack/loadtests/gatling/lib/scala-library.jar | Bin 7126372 -> 0 bytes
stack/loadtests/gatling/lib/scala-reflect.jar | Bin 3203471 -> 0 bytes
.../gatling/lib/scala-swing-2.10.4.jar | Bin 707298 -> 0 bytes
.../lib/scalalogging-slf4j_2.10-1.1.0.jar | Bin 79003 -> 0 bytes
.../loadtests/gatling/lib/scopt_2.10-3.2.0.jar | Bin 122918 -> 0 bytes
stack/loadtests/gatling/lib/slf4j-api-1.7.7.jar | Bin 29257 -> 0 bytes
stack/loadtests/gatling/lib/t-digest-3.0.jar | Bin 49754 -> 0 bytes
stack/loadtests/gatling/lib/threetenbp-1.0.jar | Bin 507797 -> 0 bytes
.../gatling/lib/uncommons-maths-1.2.3.jar | Bin 49923 -> 0 bytes
stack/loadtests/gatling/lib/zinc-0.3.5.3.jar | Bin 392810 -> 0 bytes
stack/loadtests/gatling/scripts/gatling-ug.sh | 49 -----
.../gatling/user-files/data/search.csv | 3 -
.../gatling/user-files/request-bodies/.keep | 0
stack/loadtests/loadtest_setup.sh | 45 -----
stack/loadtests/pom.xml | 156 ++++++++++++++
.../data-generators/EntityDataGenerator.scala | 57 ------
.../data-generators/FeederGenerator.scala | 101 ----------
.../scenarios/ApplicationScenarios.scala | 45 -----
.../scenarios/ConnectionScenarios.scala | 30 ---
.../usergrid/scenarios/DeviceScenarios.scala | 65 ------
.../usergrid/scenarios/GeoScenarios.scala | 43 ----
.../scenarios/NotificationScenarios.scala | 71 -------
.../usergrid/scenarios/NotifierScenarios.scala | 65 ------
.../scenarios/OrganizationScenarios.scala | 42 ----
.../usergrid/scenarios/TokenScenarios.scala | 59 ------
.../usergrid/scenarios/UserScenarios.scala | 50 -----
.../org/apache/usergrid/settings/Headers.scala | 43 ----
.../org/apache/usergrid/settings/Settings.scala | 54 -----
.../org/apache/usergrid/settings/Utils.scala | 87 --------
.../simulations/GetEntitySimulation.scala | 41 ----
.../simulations/PostDevicesSimulation.scala | 42 ----
.../simulations/PostUsersSimulation.scala | 47 -----
.../PushTargetDeviceSimulation.scala | 53 -----
.../simulations/PushTargetUserSimulation.scala | 68 -------
.../datagenerators/EntityDataGenerator.scala | 59 ++++++
.../datagenerators/FeederGenerator.scala | 114 +++++++++++
.../scenarios/ApplicationScenarios.scala | 46 +++++
.../scenarios/ConnectionScenarios.scala | 36 ++++
.../usergrid/scenarios/DeviceScenarios.scala | 85 ++++++++
.../usergrid/scenarios/GeoScenarios.scala | 44 ++++
.../scenarios/NotificationScenarios.scala | 74 +++++++
.../usergrid/scenarios/NotifierScenarios.scala | 66 ++++++
.../scenarios/OrganizationScenarios.scala | 43 ++++
.../usergrid/scenarios/TokenScenarios.scala | 60 ++++++
.../usergrid/scenarios/UserScenarios.scala | 50 +++++
.../org/apache/usergrid/settings/Headers.scala | 43 ++++
.../org/apache/usergrid/settings/Settings.scala | 50 +++++
.../org/apache/usergrid/settings/Utils.scala | 91 +++++++++
.../simulations/GetEntitySimulation.scala | 44 ++++
.../simulations/PostDevicesSimulation.scala | 45 +++++
.../simulations/PostUsersSimulation.scala | 50 +++++
...PushNotificationTargetDeviceSimulation.scala | 57 ++++++
.../PushNotificationTargetUserSimulation.scala | 72 +++++++
stack/loadtests/src/main/scripts/gatling-ug.sh | 51 +++++
stack/loadtests/src/test/resources/gatling.conf | 154 ++++++++++++++
stack/loadtests/src/test/resources/logback.xml | 37 ++++
.../loadtests/src/test/resources/recorder.conf | 37 ++++
stack/loadtests/src/test/scala/Engine.scala | 32 +++
.../src/test/scala/IDEPathHelper.scala | 37 ++++
stack/loadtests/src/test/scala/Recorder.scala | 28 +++
102 files changed, 1661 insertions(+), 1683 deletions(-)
----------------------------------------------------------------------
[08/14] git commit: [APIBAAS-1362]Have the update script only update
the war file
Posted by to...@apache.org.
[APIBAAS-1362]Have the update script only update the war file
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2db32094
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2db32094
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2db32094
Branch: refs/heads/key-row-sharding
Commit: 2db320943fdbc993b766f8d0b42fde57c0f918ad
Parents: 036a5c0
Author: ryan bridges <rb...@apigee.com>
Authored: Tue Nov 4 11:01:21 2014 -0500
Committer: ryan bridges <rb...@apigee.com>
Committed: Tue Nov 4 11:01:21 2014 -0500
----------------------------------------------------------------------
stack/awscluster/src/main/dist/update.sh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2db32094/stack/awscluster/src/main/dist/update.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/update.sh b/stack/awscluster/src/main/dist/update.sh
index e8054ef..d3c399f 100644
--- a/stack/awscluster/src/main/dist/update.sh
+++ b/stack/awscluster/src/main/dist/update.sh
@@ -1,13 +1,13 @@
-#!/bin/bash
+#!/bin/bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. The ASF licenses this file to You
# under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,16 +20,16 @@
sudo mkdir __tmpupdate__
pushd __tmpupdate__
- sudo s3cmd --config=/etc/s3cfg get s3://${RELEASE_BUCKET}/awscluster-1.0-SNAPSHOT-any.tar.gz
- sudo tar xzvf awscluster-1.0-SNAPSHOT-any.tar.gz
+ sudo s3cmd --config=/etc/s3cfg get s3://${RELEASE_BUCKET}/ROOT.war
+ # sudo tar xzvf awscluster-1.0-SNAPSHOT-any.tar.gz
sudo /etc/init.d/tomcat7 stop
- sudo cp -r webapps/* /var/lib/tomcat7/webapps
+ sudo cp -r ROOT.war /var/lib/tomcat7/webapps
pushd /usr/share/usergrid/scripts
- sudo groovy configure_portal_new.groovy > /var/lib/tomcat7/webapps/portal/config.js
+ sudo groovy configure_portal_new.groovy > /var/lib/tomcat7/webapps/portal/config.js
popd
sudo /etc/init.d/tomcat7 start
-popd
+popd
sudo rm -rf __tmpupdate__
[06/14] git commit: [APIBAAS-1362]Modify script to pull war and init
scripts separately
Posted by to...@apache.org.
[APIBAAS-1362]Modify script to pull war and init scripts separately
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/578ce4fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/578ce4fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/578ce4fd
Branch: refs/heads/key-row-sharding
Commit: 578ce4fd43608fcecfb5cd06eb72b5b30f1327ba
Parents: 4ae6472
Author: ryan bridges <rb...@apigee.com>
Authored: Tue Nov 4 10:19:18 2014 -0500
Committer: ryan bridges <rb...@apigee.com>
Committed: Tue Nov 4 10:19:18 2014 -0500
----------------------------------------------------------------------
stack/awscluster/ugcluster-cf.json | 40 ++++++++++++++++++++-------------
1 file changed, 24 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/578ce4fd/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json
index 0e5570d..6c97e8d 100644
--- a/stack/awscluster/ugcluster-cf.json
+++ b/stack/awscluster/ugcluster-cf.json
@@ -15,7 +15,7 @@
"ReleaseBucket": {
"Description": "S3 Bucket where Usergrid assembly is to be found.",
"Type": "String",
- "Default": "ug-cloudformation"
+ "Default": "usergrid-jenkins-builds"
},
"RestMinServers": {
"Description": "Minimum number of REST servers.",
@@ -49,7 +49,7 @@
"KeyPair": {
"Description": "EC2 key pair to be use for SSH access",
"Type": "String",
- "Default": "ug-cloudformation"
+ "Default": "jenkins-east"
},
"CassClusterName": {
"Description": "Name to be used for Cassandra cluster.",
@@ -309,9 +309,11 @@
"apt-get update\n",
"apt-get -y install s3cmd\n",
"cd /usr/share/usergrid\n",
- "s3cmd --config=/etc/s3cfg get s3://", { "Ref":"ReleaseBucket" }, "/awscluster-1.0-SNAPSHOT-any.tar.gz\n",
- "tar xvf awscluster-1.0-SNAPSHOT-any.tar.gz\n",
- "rm -fr awscluster-1.0-SNAPSHOT-any.tar.gz\n",
+ "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/aws-init-scripts.tgz\n",
+ "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/stack/rest/target/ROOT.war\n",
+ "tar xvf aws-init-scripts.tgz\n",
+ "rm -fr aws-init-scripts.tgz\n",
+ "mv ROOT.war webapps/ROOT.war\n",
"chmod 755 ./init_instance/*.sh\n",
"cd ./init_instance\n",
"# Init as a REST intance \n",
@@ -554,9 +556,11 @@
"apt-get update\n",
"apt-get -y install s3cmd\n",
"cd /usr/share/usergrid\n",
- "s3cmd --config=/etc/s3cfg get s3://", { "Ref":"ReleaseBucket" }, "/awscluster-1.0-SNAPSHOT-any.tar.gz\n",
- "tar xvf awscluster-1.0-SNAPSHOT-any.tar.gz\n",
- "rm -fr awscluster-1.0-SNAPSHOT-any.tar.gz\n",
+ "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/aws-init-scripts.tgz\n",
+ "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/stack/rest/target/ROOT.war\n",
+ "tar xvf aws-init-scripts.tgz\n",
+ "rm -fr aws-init-scripts.tgz\n",
+ "mv ROOT.war webapps/ROOT.war\n",
"chmod 755 ./init_instance/*.sh\n",
"cd ./init_instance\n",
"# init as a Cassandra node \n",
@@ -675,7 +679,7 @@
"export TYPE=es\n",
"export STACK_NAME=", { "Ref":"AWS::StackName" }, "\n", "\n",
"export PUBLIC_HOSTNAME=`(curl -s http://169.254.169.254/latest/meta-data/public-hostname)`\n",
- "export INTERNAL_HOSTNAME=`(curl http://169.254.169.254/latest/meta-data/local-ipv4)`\n",
+ "export INTERNAL_HOSTNAME=`(curl http://169.254.169.254/latest/meta-data/local-ipv4)`\n",
"\n",
"export EC2_INSTANCE_ID=`ec2metadata --instance-id`\n",
"export EC2_REGION=", { "Ref":"AWS::Region" },
@@ -715,9 +719,11 @@
"apt-get update\n",
"apt-get -y install s3cmd\n",
"cd /usr/share/usergrid\n",
- "s3cmd --config=/etc/s3cfg get s3://", { "Ref":"ReleaseBucket" }, "/awscluster-1.0-SNAPSHOT-any.tar.gz\n",
- "tar xvf awscluster-1.0-SNAPSHOT-any.tar.gz\n",
- "rm -fr awscluster-1.0-SNAPSHOT-any.tar.gz\n",
+ "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/aws-init-scripts.tgz\n",
+ "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/stack/rest/target/ROOT.war\n",
+ "tar xvf aws-init-scripts.tgz\n",
+ "rm -fr aws-init-scripts.tgz\n",
+ "mv ROOT.war webapps/ROOT.war\n",
"chmod 755 ./init_instance/*.sh\n",
"cd ./init_instance\n",
"# init as an ES node \n",
@@ -884,9 +890,11 @@
"apt-get update\n",
"apt-get -y install s3cmd\n",
"cd /usr/share/usergrid\n",
- "s3cmd --config=/etc/s3cfg get s3://", { "Ref":"ReleaseBucket" }, "/awscluster-1.0-SNAPSHOT-any.tar.gz\n",
- "tar xvf awscluster-1.0-SNAPSHOT-any.tar.gz\n",
- "rm -fr awscluster-1.0-SNAPSHOT-any.tar.gz\n",
+ "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/aws-init-scripts.tgz\n",
+ "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/stack/rest/target/ROOT.war\n",
+ "tar xvf aws-init-scripts.tgz\n",
+ "rm -fr aws-init-scripts.tgz\n",
+ "mv ROOT.war webapps/ROOT.war\n",
"chmod 755 ./init_instance/*.sh\n",
"cd ./init_instance\n",
"# Init as a REST intance \n",
@@ -1270,7 +1278,7 @@
}
]
}
- },
+ },
"AllowCassToCassOnAllPorts": {
"Type": "AWS::EC2::SecurityGroupIngress",
"Properties": {
[09/14] git commit: [APIBAAS-1362]Update CF scripts to reference new
names/paths for init tarball and ROOT.war
Posted by to...@apache.org.
[APIBAAS-1362]Update CF scripts to reference new names/paths for init tarball and ROOT.war
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/604d4f97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/604d4f97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/604d4f97
Branch: refs/heads/key-row-sharding
Commit: 604d4f97dad20230eece31fb7dfb78ebfd9bb825
Parents: 2db3209
Author: ryan bridges <rb...@apigee.com>
Authored: Tue Nov 4 11:02:06 2014 -0500
Committer: ryan bridges <rb...@apigee.com>
Committed: Tue Nov 4 11:02:06 2014 -0500
----------------------------------------------------------------------
stack/awscluster/ugcluster-cf.json | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/604d4f97/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json
index 6c97e8d..30e4bd0 100644
--- a/stack/awscluster/ugcluster-cf.json
+++ b/stack/awscluster/ugcluster-cf.json
@@ -309,10 +309,10 @@
"apt-get update\n",
"apt-get -y install s3cmd\n",
"cd /usr/share/usergrid\n",
- "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/aws-init-scripts.tgz\n",
- "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/stack/rest/target/ROOT.war\n",
- "tar xvf aws-init-scripts.tgz\n",
- "rm -fr aws-init-scripts.tgz\n",
+ "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/awscluster-1.0-SNAPSHOT-any.tar.gz\n",
+ "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/ROOT.war\n",
+ "tar xvf awscluster-1.0-SNAPSHOT-any.tar.gz\n",
+ "rm -fr awscluster-1.0-SNAPSHOT-any.tar.gz\n",
"mv ROOT.war webapps/ROOT.war\n",
"chmod 755 ./init_instance/*.sh\n",
"cd ./init_instance\n",
@@ -556,10 +556,10 @@
"apt-get update\n",
"apt-get -y install s3cmd\n",
"cd /usr/share/usergrid\n",
- "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/aws-init-scripts.tgz\n",
- "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/stack/rest/target/ROOT.war\n",
- "tar xvf aws-init-scripts.tgz\n",
- "rm -fr aws-init-scripts.tgz\n",
+ "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/awscluster-1.0-SNAPSHOT-any.tar.gz\n",
+ "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/ROOT.war\n",
+ "tar xvf awscluster-1.0-SNAPSHOT-any.tar.gz\n",
+ "rm -fr awscluster-1.0-SNAPSHOT-any.tar.gz\n",
"mv ROOT.war webapps/ROOT.war\n",
"chmod 755 ./init_instance/*.sh\n",
"cd ./init_instance\n",
@@ -719,10 +719,10 @@
"apt-get update\n",
"apt-get -y install s3cmd\n",
"cd /usr/share/usergrid\n",
- "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/aws-init-scripts.tgz\n",
- "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/stack/rest/target/ROOT.war\n",
- "tar xvf aws-init-scripts.tgz\n",
- "rm -fr aws-init-scripts.tgz\n",
+ "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/awscluster-1.0-SNAPSHOT-any.tar.gz\n",
+ "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/ROOT.war\n",
+ "tar xvf awscluster-1.0-SNAPSHOT-any.tar.gz\n",
+ "rm -fr awscluster-1.0-SNAPSHOT-any.tar.gz\n",
"mv ROOT.war webapps/ROOT.war\n",
"chmod 755 ./init_instance/*.sh\n",
"cd ./init_instance\n",
@@ -890,10 +890,10 @@
"apt-get update\n",
"apt-get -y install s3cmd\n",
"cd /usr/share/usergrid\n",
- "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/aws-init-scripts.tgz\n",
- "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/stack/rest/target/ROOT.war\n",
- "tar xvf aws-init-scripts.tgz\n",
- "rm -fr aws-init-scripts.tgz\n",
+ "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/awscluster-1.0-SNAPSHOT-any.tar.gz\n",
+ "s3cmd --config=/etc/s3cfg get s3://", {"Ref": "ReleaseBucket"}, "/ROOT.war\n",
+ "tar xvf awscluster-1.0-SNAPSHOT-any.tar.gz\n",
+ "rm -fr awscluster-1.0-SNAPSHOT-any.tar.gz\n",
"mv ROOT.war webapps/ROOT.war\n",
"chmod 755 ./init_instance/*.sh\n",
"cd ./init_instance\n",
[12/14] git commit: Merge remote-tracking branch 'ryan/APIBAAS-1362'
into ryan-integration
Posted by to...@apache.org.
Merge remote-tracking branch 'ryan/APIBAAS-1362' into ryan-integration
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/179bc18f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/179bc18f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/179bc18f
Branch: refs/heads/key-row-sharding
Commit: 179bc18f36ce7fd59ed615af9fba2993589880f0
Parents: 5fdbfa0 604d4f9
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Nov 4 15:47:12 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Nov 4 15:47:12 2014 -0700
----------------------------------------------------------------------
stack/awscluster/assembly.xml | 8 ++--
stack/awscluster/pom.xml | 66 +++++++++++++++++++--------
stack/awscluster/src/main/dist/update.sh | 16 +++----
stack/awscluster/ugcluster-cf.json | 24 ++++++----
stack/pom.xml | 10 ++--
5 files changed, 79 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/179bc18f/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/179bc18f/stack/pom.xml
----------------------------------------------------------------------