Repository: usergrid Updated Branches: refs/heads/master 447aaa123 -> ebab21e0b
Use defaults always for max requests per connection for datastax driver. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/ebab21e0 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ebab21e0 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ebab21e0 Branch: refs/heads/master Commit: ebab21e0baea0e63b0d6106c3bf9b305684ddc55 Parents: 447aaa1 Author: Michael Russo <[email protected]> Authored: Mon Nov 21 11:17:25 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Mon Nov 21 11:17:25 2016 -0800 ---------------------------------------------------------------------- .../src/test/resources/usergrid-UNIT.properties | 2 +- .../collection/src/test/resources/usergrid.properties | 10 +++++----- .../core/datastax/impl/DataStaxClusterImpl.java | 4 +--- 3 files changed, 7 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/ebab21e0/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 b091980..ec8a4a2 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=15 cassandra.timeout.pool=60000 cassandra.port=9160 cassandra.hosts=localhost http://git-wip-us.apache.org/repos/asf/usergrid/blob/ebab21e0/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 921e166..e85b1ac 100644 --- a/stack/corepersistence/collection/src/test/resources/usergrid.properties +++ b/stack/corepersistence/collection/src/test/resources/usergrid.properties @@ -31,11 +31,11 @@ usergrid.cluster.seeds=us-east\:localhost collection.uniquevalues.actors=50 collection.uniquevalues.authoritative.region=us-east -cassandra.connections=50 -cassandra.timeout.pool=30000 +cassandra.connections=15 +cassandra.timeout.pool=240000 -queue.num.actors=10 -queue.sender.num.actors=10 -queue.writer.num.actors=10 +queue.num.actors=5 +queue.sender.num.actors=5 +queue.writer.num.actors=5 # --- End: Usergrid cluster/actor system settings http://git-wip-us.apache.org/repos/asf/usergrid/blob/ebab21e0/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 bd7d326..af92392 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 @@ -288,9 +288,7 @@ public class DataStaxClusterImpl implements DataStaxCluster { .setCoreConnectionsPerHost(HostDistance.LOCAL, cassandraConfig.getConnections()) .setMaxConnectionsPerHost(HostDistance.LOCAL, cassandraConfig.getConnections()) .setIdleTimeoutSeconds( cassandraConfig.getPoolTimeout() / 1000 ) - .setPoolTimeoutMillis( cassandraConfig.getPoolTimeout()) - .setMaxRequestsPerConnection(HostDistance.LOCAL, 20000) - .setMaxRequestsPerConnection(HostDistance.REMOTE, 2000); + .setPoolTimeoutMillis( cassandraConfig.getPoolTimeout()); // purposely add a couple seconds to the driver's lower level socket timeouts vs. cassandra timeouts final SocketOptions socketOptions = new SocketOptions()
