This is an automated email from the ASF dual-hosted git repository.
joaoreis pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-gocql-driver.git
The following commit(s) were added to refs/heads/trunk by this push:
new 540cb3d1 Fix issue where a timeout closes the connection
540cb3d1 is described below
commit 540cb3d144b541dd395265149943d69b3129f1a4
Author: João Reis <[email protected]>
AuthorDate: Fri Jul 18 16:13:34 2025 +0100
Fix issue where a timeout closes the connection
As part of CASSGO-12 which was supposedly just removing deprecated code,
the driver now closes connections when a timeout occurs which was unintended.
This patch fixes this issue.
patch by João Reis; reviewed by Bohdan Siryk and Lukasz Antoniak for
CASSGO-87
---
CHANGELOG.md | 1 +
conn.go | 17 ++++++-----------
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68166e39..fb779d7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,7 @@ and this project adheres to [Semantic
Versioning](https://semver.org/spec/v2.0.0
#### 2.0.0
+- Driver closes connection when timeout occurs (CASSGO-87)
- Do not set beta protocol flag when using v5 (CASSGO-88)
#### 2.0.0-rc1
diff --git a/conn.go b/conn.go
index 877c2aae..b7f3723d 100644
--- a/conn.go
+++ b/conn.go
@@ -199,8 +199,6 @@ type Conn struct {
ctx context.Context
cancel context.CancelFunc
- timeouts int64
-
logger StructuredLogger
}
@@ -753,12 +751,6 @@ func (c *Conn) releaseStream(call *callReq) {
}
}
-func (c *Conn) handleTimeout() {
- if atomic.AddInt64(&c.timeouts, 1) > 0 {
- c.closeWithError(ErrTooManyTimeouts)
- }
-}
-
func (c *Conn) recvSegment(ctx context.Context) error {
var (
frame []byte
@@ -1339,7 +1331,6 @@ func (c *Conn) execInternal(ctx context.Context, req
frameBuilder, tracer Tracer
close(call.timeout)
c.logger.Debug("Request timed out on connection.",
newLogFieldString("host_id", c.host.HostID()),
newLogFieldIp("addr", c.host.ConnectAddress()))
- c.handleTimeout()
return nil, ErrTimeoutNoResponse
case <-ctxDone:
c.logger.Debug("Request failed because context elapsed out on
connection.",
@@ -2004,9 +1995,13 @@ func (c *Conn) awaitSchemaAgreement(ctx context.Context)
(err error) {
}
var (
- ErrQueryArgLength = errors.New("gocql: query argument length
mismatch")
ErrTimeoutNoResponse = errors.New("gocql: no response received from
cassandra within timeout period")
- ErrTooManyTimeouts = errors.New("gocql: too many query timeouts on
the connection")
ErrConnectionClosed = errors.New("gocql: connection closed waiting for
response")
ErrNoStreams = errors.New("gocql: no streams available on
connection")
+
+ // Deprecated: TimeoutLimit was removed so this is never returned by
the driver now
+ ErrTooManyTimeouts = errors.New("gocql: too many query timeouts on the
connection")
+
+ // Deprecated: Never returned by the driver
+ ErrQueryArgLength = errors.New("gocql: query argument length mismatch")
)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
