Repository: usergrid Updated Branches: refs/heads/master daf608e10 -> 84af16111
Add more database connections for the tests ( single database host being used in CI jobs ). Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/84af1611 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/84af1611 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/84af1611 Branch: refs/heads/master Commit: 84af16111a34d26543233f369068678deceb1a54 Parents: daf608e Author: Michael Russo <[email protected]> Authored: Fri Nov 11 23:17:37 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Fri Nov 11 23:17:37 2016 -0800 ---------------------------------------------------------------------- stack/core/src/test/resources/usergrid-custom-test.properties | 2 +- .../collection/src/test/resources/dynamic-test.properties | 2 +- .../collection/src/test/resources/usergrid-CHOP.properties | 2 +- .../collection/src/test/resources/usergrid-UNIT.properties | 2 +- .../collection/src/test/resources/usergrid.properties | 2 +- .../persistence/core/datastax/impl/DataStaxClusterImpl.java | 2 +- .../common/src/test/resources/usergrid-UNIT.properties | 2 +- .../graph/src/test/resources/usergrid-AWS.properties | 2 +- .../graph/src/test/resources/usergrid-CHOP.properties | 2 +- .../graph/src/test/resources/usergrid-UNIT.properties | 2 +- .../queryindex/src/test/resources/dynamic-test.properties | 2 +- .../queryindex/src/test/resources/usergrid-CHOP.properties | 2 +- .../queryindex/src/test/resources/usergrid-UNIT.properties | 2 +- stack/corepersistence/queue/src/test/resources/qakka.properties | 2 +- stack/rest/src/test/resources/usergrid-custom-test.properties | 2 +- stack/services/src/test/resources/usergrid-custom-test.properties | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/84af1611/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 9aeac82..ea78478 100644 --- a/stack/core/src/test/resources/usergrid-custom-test.properties +++ b/stack/core/src/test/resources/usergrid-custom-test.properties @@ -14,7 +14,7 @@ # 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.connections=50 +cassandra.connections=100 #Not a good number for real systems. Write shards should be 2x cluster size from our tests http://git-wip-us.apache.org/repos/asf/usergrid/blob/84af1611/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 1893e48..1e27c18 100644 --- a/stack/corepersistence/collection/src/test/resources/dynamic-test.properties +++ b/stack/corepersistence/collection/src/test/resources/dynamic-test.properties @@ -1,6 +1,6 @@ # The properties are not the actual configuration properties but # safe dynamic property defaults for our testing via IDE or Maven -cassandra.connections=50 +cassandra.connections=100 cassandra.timeout.pool=10000 cassandra.port=9160 cassandra.hosts=localhost http://git-wip-us.apache.org/repos/asf/usergrid/blob/84af1611/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 e5809da..a21e09e 100644 --- a/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties +++ b/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties @@ -18,7 +18,7 @@ # These are for CHOP environment settings -cassandra.connections=50 +cassandra.connections=100 cassandra.timeout.pool=10000 cassandra.port=9160 http://git-wip-us.apache.org/repos/asf/usergrid/blob/84af1611/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 f4bc705..56f025b 100644 --- a/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties +++ b/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties @@ -18,7 +18,7 @@ # # Keep nothing but overriding test defaults in here -cassandra.connections=50 +cassandra.connections=100 cassandra.timeout.pool=10000 cassandra.port=9160 cassandra.hosts=localhost http://git-wip-us.apache.org/repos/asf/usergrid/blob/84af1611/stack/corepersistence/collection/src/test/resources/usergrid.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/resources/usergrid.properties b/stack/corepersistence/collection/src/test/resources/usergrid.properties index 7a2b559..73e7875 100644 --- a/stack/corepersistence/collection/src/test/resources/usergrid.properties +++ b/stack/corepersistence/collection/src/test/resources/usergrid.properties @@ -31,7 +31,7 @@ usergrid.cluster.seeds=us-east\:localhost collection.uniquevalues.actors=300 collection.uniquevalues.authoritative.region=us-east -cassandra.connections=50 +cassandra.connections=100 cassandra.timeout.pool=10000 # --- End: Usergrid cluster/actor system settings http://git-wip-us.apache.org/repos/asf/usergrid/blob/84af1611/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 df09a7c..55a2de8 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 @@ -207,7 +207,7 @@ public class DataStaxClusterImpl implements DataStaxCluster { final PoolingOptions poolingOptions = new PoolingOptions() .setCoreConnectionsPerHost(HostDistance.LOCAL, cassandraConfig.getConnections()) .setMaxConnectionsPerHost(HostDistance.LOCAL, cassandraConfig.getConnections()) - .setIdleTimeoutSeconds( cassandraConfig.getTimeout() / 1000) + .setIdleTimeoutSeconds( 1 ) .setPoolTimeoutMillis( cassandraConfig.getPoolTimeout()) .setMaxRequestsPerConnection(HostDistance.LOCAL, 20000) .setMaxRequestsPerConnection(HostDistance.REMOTE, 2000); http://git-wip-us.apache.org/repos/asf/usergrid/blob/84af1611/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties b/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties index e31dad0..9099751 100644 --- a/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties +++ b/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties @@ -18,7 +18,7 @@ # # Keep nothing but overriding test defaults in here -cassandra.connections=30 +cassandra.connections=100 cassandra.port=9160 cassandra.hosts=localhost cassandra.cluster_name=Usergrid http://git-wip-us.apache.org/repos/asf/usergrid/blob/84af1611/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 e737815..ea921ae 100644 --- a/stack/corepersistence/graph/src/test/resources/usergrid-AWS.properties +++ b/stack/corepersistence/graph/src/test/resources/usergrid-AWS.properties @@ -1,5 +1,5 @@ # Keep nothing but overriding test defaults in here -cassandra.connections=50 +cassandra.connections=100 cassandra.port=9160 cassandra.hosts= #cassandra.hosts=localhost http://git-wip-us.apache.org/repos/asf/usergrid/blob/84af1611/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 92d0041..43f8c86 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=50 +cassandra.connections=100 cassandra.port=9160 # a comma delimited private IP address list to your chop cassandra cluster http://git-wip-us.apache.org/repos/asf/usergrid/blob/84af1611/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 6f8a7c5..89430c6 100644 --- a/stack/corepersistence/graph/src/test/resources/usergrid-UNIT.properties +++ b/stack/corepersistence/graph/src/test/resources/usergrid-UNIT.properties @@ -1,5 +1,5 @@ # Keep nothing but overriding test defaults in here -cassandra.connections=50 +cassandra.connections=100 cassandra.port=9160 cassandra.hosts=localhost cassandra.cluster_name=Usergrid http://git-wip-us.apache.org/repos/asf/usergrid/blob/84af1611/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 7b869af..c6dc9c4 100644 --- a/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties +++ b/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties @@ -1,6 +1,6 @@ # The properties are not the actual configuration properties but # safe dynamic property defaults for our testing via IDE or Maven -cassandra.connections=50 +cassandra.connections=100 cassandra.port=9160 cassandra.hosts=localhost cassandra.cluster_name=Usergrid http://git-wip-us.apache.org/repos/asf/usergrid/blob/84af1611/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 ff4f3bb..d57e46c 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=50 +cassandra.connections=100 cassandra.port=9160 # a comma delimited private IP address list to your chop cassandra cluster http://git-wip-us.apache.org/repos/asf/usergrid/blob/84af1611/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 3c853ac..443990f 100644 --- a/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties +++ b/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties @@ -4,7 +4,7 @@ cassandra.embedded=true cassandra.hosts=127.0.0.1 cassandra.port=9160 cassandra.cluster_name=Usergrid -cassandra.connections=50 +cassandra.connections=100 collections.keyspace=Usergrid_Collections collections.keyspace.strategy.options=replication_factor:1 http://git-wip-us.apache.org/repos/asf/usergrid/blob/84af1611/stack/corepersistence/queue/src/test/resources/qakka.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/test/resources/qakka.properties b/stack/corepersistence/queue/src/test/resources/qakka.properties index 3c000c2..caccf9f 100644 --- a/stack/corepersistence/queue/src/test/resources/qakka.properties +++ b/stack/corepersistence/queue/src/test/resources/qakka.properties @@ -64,5 +64,5 @@ cassandra.keyspace.queue-message=qakka_test_queue_messages cassandra.keyspace-drop-and-create=true -cassandra.connections=50 +cassandra.connections=100 cassandra.timeout.pool=10000 http://git-wip-us.apache.org/repos/asf/usergrid/blob/84af1611/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 4b4b165..37ac5bc 100644 --- a/stack/rest/src/test/resources/usergrid-custom-test.properties +++ b/stack/rest/src/test/resources/usergrid-custom-test.properties @@ -16,7 +16,7 @@ # REST module test properties cassandra.startup=external -cassandra.connections=50 +cassandra.connections=100 elasticsearch.startup=external http://git-wip-us.apache.org/repos/asf/usergrid/blob/84af1611/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 7524b1c..6d97a91 100644 --- a/stack/services/src/test/resources/usergrid-custom-test.properties +++ b/stack/services/src/test/resources/usergrid-custom-test.properties @@ -16,7 +16,7 @@ # with ug.heapmax=5000m and ug.heapmin=3000m (set in Maven settings.xml) cassandra.startup=external elasticsearch.startup=external -cassandra.connections=50 +cassandra.connections=100 #Poll interval to check for new jobs in millseconds. 10 milliseconds for testing usergrid.scheduler.job.interval=100
