Repository: usergrid Updated Branches: refs/heads/master b89526065 -> 664a2cfe3
Update timeout configurations. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/664a2cfe Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/664a2cfe Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/664a2cfe Branch: refs/heads/master Commit: 664a2cfe374e533fea9dc1137ea4079c12259433 Parents: b895260 Author: Michael Russo <mru...@apigee.com> Authored: Sat Nov 12 00:38:18 2016 -0800 Committer: Michael Russo <mru...@apigee.com> Committed: Sat Nov 12 00:38:18 2016 -0800 ---------------------------------------------------------------------- .../persistence/core/datastax/impl/DataStaxClusterImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/664a2cfe/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 7783a0c..bc0c61d 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,14 +207,14 @@ public class DataStaxClusterImpl implements DataStaxCluster { final PoolingOptions poolingOptions = new PoolingOptions() .setCoreConnectionsPerHost(HostDistance.LOCAL, cassandraConfig.getConnections()) .setMaxConnectionsPerHost(HostDistance.LOCAL, cassandraConfig.getConnections()) - .setIdleTimeoutSeconds( 1 ) + .setIdleTimeoutSeconds( cassandraConfig.getPoolTimeout() ) .setPoolTimeoutMillis( cassandraConfig.getPoolTimeout()) .setMaxRequestsPerConnection(HostDistance.LOCAL, 20000) .setMaxRequestsPerConnection(HostDistance.REMOTE, 2000); // purposely add a couple seconds to the driver's lower level socket timeouts vs. cassandra timeouts final SocketOptions socketOptions = new SocketOptions() - .setConnectTimeoutMillis( cassandraConfig.getPoolTimeout() + 2000) + .setConnectTimeoutMillis( cassandraConfig.getTimeout() + 2000) .setReadTimeoutMillis( cassandraConfig.getTimeout() + 2000); final QueryOptions queryOptions = new QueryOptions()
