connection timeout override with custom was fixed

Author: tengu-alt

cassandra_test.go

@@ -3410,3 +3410,42 @@ func TestQuery_SetHostID(t *testing.T) {
 		t.Fatalf("Expected error to be: %v, but got %v", ErrNoConnections, err)
 	}
 }
+
+func TestTimeoutOverride(t *testing.T) {
+	session := createSession(t)
+	defer session.Close()
+
+	if session.cfg.ProtoVersion < 3 {
+		t.Skip("named Values are not supported in protocol < 3")
+	}
+
+	if err := createTable(session, "CREATE TABLE gocql_test.named_query(id int, value text, PRIMARY KEY (id))"); err != nil {
+		t.Fatal(err)
+	}
+
+	// normal case
+	err := session.Query("INSERT INTO gocql_test.named_query(id, value) VALUES(1, 'value')").Exec()
+	if err != nil {
+		t.Fatal(err)
+	}
+	//decrease Conn.timeout
+	for _, conPool := range session.executor.pool.hostConnPools {
+		for _, conn := range conPool.conns {
+			conn.timeout = 50
+		}
+
+	}
+	err = session.Query("INSERT INTO gocql_test.named_query(id, value) VALUES(2, 'value')").Exec()
+	if err == nil || err != ErrTimeoutNoResponse {
+		t.Fatalf("expected: ErrTimeoutNoResponse, got: %v", err)
+	}
+
+	// override timeout with context
+	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+	defer cancel()
+	err = session.Query("TRUNCATE TABLE gocql_test.named_query").WithContext(ctx).Exec()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+}

conn.go

@@ -1099,7 +1099,8 @@ func (c *Conn) exec(ctx context.Context, req frameBuilder, tracer Tracer) (*fram
 	}
 
 	var timeoutCh <-chan time.Time
-	if c.timeout > 0 {
+	_, isDeadline := ctx.Deadline()
+	if c.timeout > 0 && !isDeadline {
 		if call.timer == nil {
 			call.timer = time.NewTimer(0)
 			<-call.timer.C