You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/04/02 22:21:16 UTC
git commit: Updated tests as well as props for AWS
Repository: incubator-usergrid
Updated Branches:
refs/heads/asyncqueue 064d2ae09 -> 93e35b5d6
Updated tests as well as props for AWS
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/93e35b5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/93e35b5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/93e35b5d
Branch: refs/heads/asyncqueue
Commit: 93e35b5d6137f06cb131c706dde4b77882bc4023
Parents: 064d2ae
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Apr 2 12:50:26 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Apr 2 12:50:26 2014 -0700
----------------------------------------------------------------------
.../src/test/resources/usergrid-UNIT.properties | 2 +-
.../persistence/graph/GraphManagerLoadTest.java | 5 +++++
.../graph/src/test/resources/log4j.properties | 4 ++--
.../graph/src/test/resources/usergrid-AWS.properties | 12 ++++++------
.../graph/src/test/resources/usergrid-UNIT.properties | 2 +-
5 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/93e35b5d/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties b/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties
index 8680e98..ec31de5 100644
--- a/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties
+++ b/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties
@@ -8,6 +8,6 @@ collections.keyspace=Usergrid_Collections
cassandra.timeout=5000
-collections.keyspace.strategy.options=replication_factor:3
+collections.keyspace.strategy.options=replication_factor:1
collections.keyspace.strategy.class=SimpleStrategy
collection.stage.transient.timeout=60
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/93e35b5d/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerLoadTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerLoadTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerLoadTest.java
index 721de17..a7c3c38 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerLoadTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerLoadTest.java
@@ -259,6 +259,11 @@ public class GraphManagerLoadTest {
*/
public Edge newEdge();
+ /**
+ * Perform the search returning an observable edge
+ * @param manager
+ * @return
+ */
public Observable<Edge> doSearch( final GraphManager manager );
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/93e35b5d/stack/corepersistence/graph/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/resources/log4j.properties b/stack/corepersistence/graph/src/test/resources/log4j.properties
index 849b280..0ad8902 100644
--- a/stack/corepersistence/graph/src/test/resources/log4j.properties
+++ b/stack/corepersistence/graph/src/test/resources/log4j.properties
@@ -31,6 +31,6 @@ log4j.logger.org.apache.http=ERROR
log4j.logger.com.amazonaws.request=ERROR
log4j.logger.cassandra.db=ERROR
-log4j.logger.org.apache.usergrid=DEBUG
+#log4j.logger.org.apache.usergrid=DEBUG
-log4j.logger.org.apache.usergrid.persistence.graph.serialization.impl.parse=TRACE
+#log4j.logger.org.apache.usergrid.persistence.graph.serialization.impl.parse=TRACE
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/93e35b5d/stack/corepersistence/graph/src/test/resources/usergrid-AWS.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/resources/usergrid-AWS.properties b/stack/corepersistence/graph/src/test/resources/usergrid-AWS.properties
index 078e414..c479d4d 100644
--- a/stack/corepersistence/graph/src/test/resources/usergrid-AWS.properties
+++ b/stack/corepersistence/graph/src/test/resources/usergrid-AWS.properties
@@ -2,16 +2,16 @@
cassandra.connections=100
cassandra.port=9160
cassandra.version=1.2
-#cassandra.hosts=ec2-54-211-120-157.compute-1.amazonaws.com, ec2-54-235-236-189.compute-1.amazonaws.com, ec2-107-22-110-71.compute-1.amazonaws.com, ec2-54-242-241-70.compute-1.amazonaws.com, ec2-54-205-71-218.compute-1.amazonaws.com, ec2-54-205-70-94.compute-1.amazonaws.com
-cassandra.hosts=localhost
+cassandra.hosts=ec2-54-242-147-15.compute-1.amazonaws.com, ec2-54-197-129-20.compute-1.amazonaws.com, ec2-54-196-253-36.compute-1.amazonaws.com, ec2-54-221-158-223.compute-1.amazonaws.com, ec2-54-82-99-72.compute-1.amazonaws.com, ec2-54-242-224-4.compute-1.amazonaws.com
+#cassandra.hosts=localhost
cassandra.cluster_name=Usergrid
collections.keyspace=Usergrid_Collections
cassandra.timeout=5000
-#collections.keyspace.strategy.options=us-east-1:3
-#collections.keyspace.strategy.class=NetworkTopologyStrategy
-collections.keyspace.strategy.options=replication_factor:3
-collections.keyspace.strategy.class=SimpleStrategy
+collections.keyspace.strategy.options=us-east-1:3
+collections.keyspace.strategy.class=NetworkTopologyStrategy
+#collections.keyspace.strategy.options=replication_factor:1
+#collections.keyspace.strategy.class=SimpleStrategy
collection.stage.transient.timeout=60
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/93e35b5d/stack/corepersistence/graph/src/test/resources/usergrid-UNIT.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/resources/usergrid-UNIT.properties b/stack/corepersistence/graph/src/test/resources/usergrid-UNIT.properties
index 8680e98..ec31de5 100644
--- a/stack/corepersistence/graph/src/test/resources/usergrid-UNIT.properties
+++ b/stack/corepersistence/graph/src/test/resources/usergrid-UNIT.properties
@@ -8,6 +8,6 @@ collections.keyspace=Usergrid_Collections
cassandra.timeout=5000
-collections.keyspace.strategy.options=replication_factor:3
+collections.keyspace.strategy.options=replication_factor:1
collections.keyspace.strategy.class=SimpleStrategy
collection.stage.transient.timeout=60