Skip to content

refactor: Add connectTimeout #357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 20, 2020
Merged

refactor: Add connectTimeout #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
130c076
refactor: Add connectTimeout
jakubjanecek Oct 20, 2020
526456d
Merge branch 'master' into refactor/cassandra-defaults
jakubjanecek Oct 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...datastax-driver/src/main/scala/com/avast/sst/datastax/CassandraDatastaxDriverModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ object CassandraDatastaxDriverModule {
stringProperty(LOAD_BALANCING_POLICY_CLASS)(cfg.basic.loadBalancingPolicy.`class`),
optional(stringProperty(LOAD_BALANCING_LOCAL_DATACENTER), cfg.basic.loadBalancingPolicy.localDatacenter),
optional(stringProperty(LOAD_BALANCING_FILTER_CLASS), cfg.basic.loadBalancingPolicy.filter.map(_.`class`)),
durationProperty(CONNECTION_CONNECT_TIMEOUT)(cfg.advanced.connection.connectTimeout),
durationProperty(CONNECTION_INIT_QUERY_TIMEOUT)(cfg.advanced.connection.initQueryTimeout),
intProperty(CONNECTION_POOL_LOCAL_SIZE)(cfg.advanced.connection.localPool.size),
intProperty(CONNECTION_POOL_REMOTE_SIZE)(cfg.advanced.connection.remotePool.size),
Expand Down
3 changes: 2 additions & 1 deletion cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/config/advanced.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ object AdvancedRequestConfig {
* @param warnOnInitError Whether to log non-fatal errors when the driver tries to open a new connection.
*/
final case class ConnectionConfig(
connectTimeout: Duration = ConnectionConfig.Default.connectTimeout,
initQueryTimeout: Duration = ConnectionConfig.Default.initQueryTimeout,
setKeyspaceTimeout: Duration = ConnectionConfig.Default.setKeyspaceTimeout,
localPool: PoolConfig = ConnectionConfig.Default.localPool,
Expand All @@ -145,7 +146,7 @@ final case class ConnectionConfig(

object ConnectionConfig {
val Default: ConnectionConfig =
ConnectionConfig(InitQueryTimeout, InitQueryTimeout, PoolConfig.Default, PoolConfig.Default, 1024, 256, true)
ConnectionConfig(ConnectTimeout, InitQueryTimeout, InitQueryTimeout, PoolConfig.Default, PoolConfig.Default, 1024, 256, true)
}

/** The driver maintains a connection pool to each node, according to the distance assigned to it
Expand Down
3 changes: 2 additions & 1 deletion cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/config/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ package com.avast.sst.datastax
import scala.concurrent.duration._

package object config {
val InitQueryTimeout: Duration = 500.milliseconds
val ConnectTimeout: Duration = 5.seconds
val InitQueryTimeout: Duration = 5.seconds
val RequestTimeout: Duration = 2.seconds
val RequestPageSize: Int = 5000
}