Skip to content

Commit 052ac1b

Browse files
authored
refactor: Add connectTimeout (#357)
fix: Default value of initQueryTimeout
1 parent adc2909 commit 052ac1b

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/CassandraDatastaxDriverModule.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ object CassandraDatastaxDriverModule {
2828
stringProperty(LOAD_BALANCING_POLICY_CLASS)(cfg.basic.loadBalancingPolicy.`class`),
2929
optional(stringProperty(LOAD_BALANCING_LOCAL_DATACENTER), cfg.basic.loadBalancingPolicy.localDatacenter),
3030
optional(stringProperty(LOAD_BALANCING_FILTER_CLASS), cfg.basic.loadBalancingPolicy.filter.map(_.`class`)),
31+
durationProperty(CONNECTION_CONNECT_TIMEOUT)(cfg.advanced.connection.connectTimeout),
3132
durationProperty(CONNECTION_INIT_QUERY_TIMEOUT)(cfg.advanced.connection.initQueryTimeout),
3233
intProperty(CONNECTION_POOL_LOCAL_SIZE)(cfg.advanced.connection.localPool.size),
3334
intProperty(CONNECTION_POOL_REMOTE_SIZE)(cfg.advanced.connection.remotePool.size),

cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/config/advanced.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ object AdvancedRequestConfig {
134134
* @param warnOnInitError Whether to log non-fatal errors when the driver tries to open a new connection.
135135
*/
136136
final case class ConnectionConfig(
137+
connectTimeout: Duration = ConnectionConfig.Default.connectTimeout,
137138
initQueryTimeout: Duration = ConnectionConfig.Default.initQueryTimeout,
138139
setKeyspaceTimeout: Duration = ConnectionConfig.Default.setKeyspaceTimeout,
139140
localPool: PoolConfig = ConnectionConfig.Default.localPool,
@@ -145,7 +146,7 @@ final case class ConnectionConfig(
145146

146147
object ConnectionConfig {
147148
val Default: ConnectionConfig =
148-
ConnectionConfig(InitQueryTimeout, InitQueryTimeout, PoolConfig.Default, PoolConfig.Default, 1024, 256, true)
149+
ConnectionConfig(ConnectTimeout, InitQueryTimeout, InitQueryTimeout, PoolConfig.Default, PoolConfig.Default, 1024, 256, true)
149150
}
150151

151152
/** The driver maintains a connection pool to each node, according to the distance assigned to it

cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/config/package.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ package com.avast.sst.datastax
33
import scala.concurrent.duration._
44

55
package object config {
6-
val InitQueryTimeout: Duration = 500.milliseconds
6+
val ConnectTimeout: Duration = 5.seconds
7+
val InitQueryTimeout: Duration = 5.seconds
78
val RequestTimeout: Duration = 2.seconds
89
val RequestPageSize: Int = 5000
910
}

0 commit comments

Comments
 (0)