Repository: usergrid Updated Branches: refs/heads/master a77b1f463 -> a7cf58c9b
Further test tuning. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a7cf58c9 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a7cf58c9 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/a7cf58c9 Branch: refs/heads/master Commit: a7cf58c9bed7070e1b3fb74479302a6ed11f2701 Parents: a77b1f4 Author: Michael Russo <[email protected]> Authored: Sun Nov 20 01:15:58 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Sun Nov 20 01:15:58 2016 -0800 ---------------------------------------------------------------------- .../collection/src/test/resources/usergrid-UNIT.properties | 2 +- .../collection/src/test/resources/usergrid.properties | 2 +- .../persistence/core/datastax/impl/DataStaxClusterImpl.java | 4 ++-- stack/rest/src/test/resources/usergrid-custom-test.properties | 2 +- .../services/src/test/resources/usergrid-custom-test.properties | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/a7cf58c9/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 db63a89..eac9e2e 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=100 +cassandra.connections=30 cassandra.timeout.pool=30000 cassandra.port=9160 cassandra.hosts=localhost http://git-wip-us.apache.org/repos/asf/usergrid/blob/a7cf58c9/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 4fa4ebc..f2ceeb5 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=100 +cassandra.connections=30 cassandra.timeout.pool=30000 queue.num.actors=50 http://git-wip-us.apache.org/repos/asf/usergrid/blob/a7cf58c9/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 aec25a5..a318c3c 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 @@ -49,7 +49,7 @@ public class DataStaxClusterImpl implements DataStaxCluster { @Inject public DataStaxClusterImpl(final CassandraConfig cassandraFig ) throws Exception { this.cassandraConfig = cassandraFig; - this.cluster = buildCluster(); + this.cluster = getCluster(); logger.info("Initialized datastax cluster client. Hosts={}, Idle Timeout={}s, Pool Timeout={}s", cluster.getMetadata().getAllHosts().toString(), @@ -64,7 +64,7 @@ public class DataStaxClusterImpl implements DataStaxCluster { public synchronized Cluster getCluster(){ // ensure we can build the cluster if it was previously closed - if ( cluster.isClosed() ){ + if ( cluster == null || cluster.isClosed() ){ cluster = buildCluster(); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/a7cf58c9/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 3bcd68a..98c5640 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=100 +cassandra.connections=30 cassandra.timeout.pool=20000 http://git-wip-us.apache.org/repos/asf/usergrid/blob/a7cf58c9/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 5e0a1d7..e8da417 100644 --- a/stack/services/src/test/resources/usergrid-custom-test.properties +++ b/stack/services/src/test/resources/usergrid-custom-test.properties @@ -15,7 +15,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.startup=external -cassandra.connections=100 +cassandra.connections=30 cassandra.timeout.pool=20000 #Poll interval to check for new jobs in millseconds. 10 milliseconds for testing
