You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/05/11 05:46:00 UTC
[07/33] usergrid git commit: Standardizing test properties.
Standardizing test properties.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/3066ab4a
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/3066ab4a
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/3066ab4a
Branch: refs/heads/datastax-cass-driver
Commit: 3066ab4a59f5fff25f516e6869ea846a48000081
Parents: 3f8e7cb
Author: Michael Russo <mi...@gmail.com>
Authored: Thu Feb 11 18:04:35 2016 -0800
Committer: Michael Russo <mi...@gmail.com>
Committed: Thu Feb 11 18:04:35 2016 -0800
----------------------------------------------------------------------
stack/core/src/test/resources/usergrid-custom-test.properties | 1 -
.../collection/src/test/resources/dynamic-test.properties | 3 +--
.../collection/src/test/resources/usergrid-CHOP.properties | 3 +--
.../collection/src/test/resources/usergrid-UNIT.properties | 1 -
.../persistence/core/datastax/impl/DatastaxClusterImpl.java | 2 +-
.../graph/src/test/resources/usergrid-AWS.properties | 3 +--
.../graph/src/test/resources/usergrid-CHOP.properties | 3 +--
.../graph/src/test/resources/usergrid-UNIT.properties | 3 +--
.../queryindex/src/test/resources/dynamic-test.properties | 3 +--
.../queryindex/src/test/resources/usergrid-CHOP.properties | 3 +--
.../queryindex/src/test/resources/usergrid-UNIT.properties | 3 +--
stack/rest/src/test/resources/usergrid-custom-test.properties | 3 +--
stack/services/src/test/resources/usergrid-custom-test.properties | 3 +--
13 files changed, 11 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/3066ab4a/stack/core/src/test/resources/usergrid-custom-test.properties
----------------------------------------------------------------------
diff --git a/stack/core/src/test/resources/usergrid-custom-test.properties b/stack/core/src/test/resources/usergrid-custom-test.properties
index c8b4d48..a9be7ed 100644
--- a/stack/core/src/test/resources/usergrid-custom-test.properties
+++ b/stack/core/src/test/resources/usergrid-custom-test.properties
@@ -14,7 +14,6 @@
# these settings allow tests to run and consistently pass on 16GB MacBook Pro
# with ug.heapmax=5000m and ug.heapmin=3000m (set in Maven settings.xml)
-cassandra.timeout=2000
cassandra.connections=50
http://git-wip-us.apache.org/repos/asf/usergrid/blob/3066ab4a/stack/corepersistence/collection/src/test/resources/dynamic-test.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/resources/dynamic-test.properties b/stack/corepersistence/collection/src/test/resources/dynamic-test.properties
index 6b6f551..b847f50 100644
--- a/stack/corepersistence/collection/src/test/resources/dynamic-test.properties
+++ b/stack/corepersistence/collection/src/test/resources/dynamic-test.properties
@@ -1,12 +1,11 @@
# The properties are not the actual configuration properties but
# safe dynamic property defaults for our testing via IDE or Maven
-cassandra.connections=10
+cassandra.connections=50
cassandra.port=9160
cassandra.version=1.2
cassandra.hosts=localhost
cassandra.cluster_name=Usergrid
collections.keyspace=Usergrid_Collections
-cassandra.timeout=5000
collection.stage.transient.timeout=5
# This property is required to be set and cannot be defaulted anywhere
http://git-wip-us.apache.org/repos/asf/usergrid/blob/3066ab4a/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties b/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties
index 78e3400..d276934 100644
--- a/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties
+++ b/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties
@@ -1,6 +1,6 @@
# These are for CHOP environment settings
-cassandra.connections=20
+cassandra.connections=50
cassandra.port=9160
cassandra.version=1.2
@@ -9,7 +9,6 @@ cassandra.version=1.2
cassandra.hosts=${chop.cassandra.hosts}
cassandra.cluster_name=Usergrid
collections.keyspace=Usergrid_Collections
-cassandra.timeout=5000
# This property is required to be set and cannot be defaulted anywhere
usergrid.cluster_name=usergrid
http://git-wip-us.apache.org/repos/asf/usergrid/blob/3066ab4a/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 44dc399..bec1c88 100644
--- a/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties
+++ b/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties
@@ -5,7 +5,6 @@ cassandra.version=1.2
cassandra.hosts=localhost
cassandra.cluster_name=Usergrid
collections.keyspace=Usergrid_Collections
-cassandra.timeout=5000
cassandra.embedded=true
http://git-wip-us.apache.org/repos/asf/usergrid/blob/3066ab4a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DatastaxClusterImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DatastaxClusterImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DatastaxClusterImpl.java
index a0d65e0..5fc804b 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DatastaxClusterImpl.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DatastaxClusterImpl.java
@@ -94,7 +94,7 @@ public class DataStaxClusterImpl implements DataStaxCluster {
}
this.cluster = datastaxCluster.build();
- logger.info("Initialized datastax cluster client. Hosts={}, Idle Timeout={}s, Request Timeout={}s",
+ logger.info("Initialized datastax cluster client. Hosts={}, Idle Timeout={}s, Pool Timeout={}s",
cluster.getMetadata().getAllHosts().toString(),
cluster.getConfiguration().getPoolingOptions().getIdleTimeoutSeconds(),
cluster.getConfiguration().getPoolingOptions().getPoolTimeoutMillis() / 1000);
http://git-wip-us.apache.org/repos/asf/usergrid/blob/3066ab4a/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 e19f676..e630bb8 100644
--- a/stack/corepersistence/graph/src/test/resources/usergrid-AWS.properties
+++ b/stack/corepersistence/graph/src/test/resources/usergrid-AWS.properties
@@ -1,12 +1,11 @@
# Keep nothing but overriding test defaults in here
-cassandra.connections=100
+cassandra.connections=50
cassandra.port=9160
cassandra.version=1.2
cassandra.hosts=
#cassandra.hosts=localhost
cassandra.cluster_name=Usergrid
collections.keyspace=Usergrid_Collections
-cassandra.timeout=5000
collections.keyspace.strategy.options=us-east:3
http://git-wip-us.apache.org/repos/asf/usergrid/blob/3066ab4a/stack/corepersistence/graph/src/test/resources/usergrid-CHOP.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/resources/usergrid-CHOP.properties b/stack/corepersistence/graph/src/test/resources/usergrid-CHOP.properties
index 78e3400..d276934 100644
--- a/stack/corepersistence/graph/src/test/resources/usergrid-CHOP.properties
+++ b/stack/corepersistence/graph/src/test/resources/usergrid-CHOP.properties
@@ -1,6 +1,6 @@
# These are for CHOP environment settings
-cassandra.connections=20
+cassandra.connections=50
cassandra.port=9160
cassandra.version=1.2
@@ -9,7 +9,6 @@ cassandra.version=1.2
cassandra.hosts=${chop.cassandra.hosts}
cassandra.cluster_name=Usergrid
collections.keyspace=Usergrid_Collections
-cassandra.timeout=5000
# This property is required to be set and cannot be defaulted anywhere
usergrid.cluster_name=usergrid
http://git-wip-us.apache.org/repos/asf/usergrid/blob/3066ab4a/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 eb06001..e1c4c81 100644
--- a/stack/corepersistence/graph/src/test/resources/usergrid-UNIT.properties
+++ b/stack/corepersistence/graph/src/test/resources/usergrid-UNIT.properties
@@ -1,11 +1,10 @@
# Keep nothing but overriding test defaults in here
-cassandra.connections=40
+cassandra.connections=50
cassandra.port=9160
cassandra.version=1.2
cassandra.hosts=localhost
cassandra.cluster_name=Usergrid
collections.keyspace=Usergrid_Collections
-cassandra.timeout=2000
cassandra.embedded=true
http://git-wip-us.apache.org/repos/asf/usergrid/blob/3066ab4a/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties b/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties
index ed3209c..4ac97d8 100644
--- a/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties
+++ b/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties
@@ -1,12 +1,11 @@
# The properties are not the actual configuration properties but
# safe dynamic property defaults for our testing via IDE or Maven
-cassandra.connections=10
+cassandra.connections=50
cassandra.port=9160
cassandra.version=1.2
cassandra.hosts=localhost
cassandra.cluster_name=Usergrid
collections.keyspace=Usergrid_Collections
-cassandra.timeout=5000
index.query.limit.default=10
elasticsearch.indexname=QueryIndexTests
http://git-wip-us.apache.org/repos/asf/usergrid/blob/3066ab4a/stack/corepersistence/queryindex/src/test/resources/usergrid-CHOP.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/resources/usergrid-CHOP.properties b/stack/corepersistence/queryindex/src/test/resources/usergrid-CHOP.properties
index e0e71c9..ce40600 100644
--- a/stack/corepersistence/queryindex/src/test/resources/usergrid-CHOP.properties
+++ b/stack/corepersistence/queryindex/src/test/resources/usergrid-CHOP.properties
@@ -1,5 +1,5 @@
# These are for CHOP environment settings
-cassandra.connections=20
+cassandra.connections=50
cassandra.port=9160
cassandra.version=1.2
@@ -8,7 +8,6 @@ cassandra.version=1.2
cassandra.hosts=${chop.cassandra.hosts}
cassandra.cluster_name=Usergrid
collections.keyspace=Usergrid_Collections
-cassandra.timeout=5000
index.query.limit.default=10
http://git-wip-us.apache.org/repos/asf/usergrid/blob/3066ab4a/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties b/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties
index ccff66a..5d80cac 100644
--- a/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties
+++ b/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties
@@ -5,8 +5,7 @@ cassandra.hosts=127.0.0.1
cassandra.port=9160
cassandra.version=1.2
cassandra.cluster_name=Usergrid
-cassandra.connections=20
-cassandra.timeout=5000
+cassandra.connections=50
collections.keyspace=Usergrid_Collections
collections.keyspace.strategy.options=replication_factor:1
http://git-wip-us.apache.org/repos/asf/usergrid/blob/3066ab4a/stack/rest/src/test/resources/usergrid-custom-test.properties
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/usergrid-custom-test.properties b/stack/rest/src/test/resources/usergrid-custom-test.properties
index 2605c28..13e06a1 100644
--- a/stack/rest/src/test/resources/usergrid-custom-test.properties
+++ b/stack/rest/src/test/resources/usergrid-custom-test.properties
@@ -13,8 +13,7 @@
# REST module test properties
cassandra.startup=external
-cassandra.timeout=2000
-cassandra.connections=800
+cassandra.connections=50
elasticsearch.startup=external
http://git-wip-us.apache.org/repos/asf/usergrid/blob/3066ab4a/stack/services/src/test/resources/usergrid-custom-test.properties
----------------------------------------------------------------------
diff --git a/stack/services/src/test/resources/usergrid-custom-test.properties b/stack/services/src/test/resources/usergrid-custom-test.properties
index 1c3d190..9ccfc9c 100644
--- a/stack/services/src/test/resources/usergrid-custom-test.properties
+++ b/stack/services/src/test/resources/usergrid-custom-test.properties
@@ -16,8 +16,7 @@
# with ug.heapmax=5000m and ug.heapmin=3000m (set in Maven settings.xml)
cassandra.startup=external
elasticsearch.startup=external
-cassandra.timeout=2000
-cassandra.connections=1000
+cassandra.connections=50
#Poll interval to check for new jobs in millseconds. 10 milliseconds for testing
usergrid.scheduler.job.interval=100