scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-30 18:17:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set Cassandra connect timeout, not just regular timeout (#12903)

Browse Source
This commit is contained in:
Nick Cabatoff
2021-10-22 11:02:28 -04:00
committed by GitHub
parent 4d4b37bf82
commit 8f7dafec91
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/12903.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:improvement
db/cassandra: make the connect_timeout config option actually apply to connection timeouts, in addition to non-connection operations
```

1
plugins/database/cassandra/connection_producer.go
View File

@@ -189,6 +189,7 @@ func (c *cassandraConnectionProducer) createSession(ctx context.Context) (*gocql
} }
clusterConfig.Timeout = c.connectTimeout clusterConfig.Timeout = c.connectTimeout
clusterConfig.ConnectTimeout = c.connectTimeout
clusterConfig.SocketKeepalive = c.socketKeepAlive clusterConfig.SocketKeepalive = c.socketKeepAlive
clusterConfig.SslOpts = c.sslOpts clusterConfig.SslOpts = c.sslOpts

3
website/content/api-docs/secret/databases/cassandra.mdx
View File

@@ -78,7 +78,8 @@ vault write database/config/cassandra-example <...other fields> pem_json=@/path/
- `protocol_version` `(int: 2)` – Specifies the CQL protocol version to use. - `protocol_version` `(int: 2)` – Specifies the CQL protocol version to use.
- `connect_timeout` `(string: "5s")` – Specifies the connection timeout to use. - `connect_timeout` `(string: "5s")` – Specifies the timeout to use, both for
connections and in general.
- `local_datacenter` `(string: "")` – If set, enables host selection policy - `local_datacenter` `(string: "")` – If set, enables host selection policy
which will prioritize and use hosts which are in the local datacenter before which will prioritize and use hosts which are in the local datacenter before