MaxRequestsPerConn cluster param was added

Author: testisnullus

AUTHORS

@@ -141,3 +141,4 @@ Dmitry Kropachev <[email protected]>
 Oliver Boyle <[email protected]>
 Jackson Fleming <[email protected]>
 Sylwia Szunejko <[email protected]>
+Danylo Savchenko <[email protected]>

cluster.go

@@ -86,6 +86,11 @@ type ClusterConfig struct {
 	// Default: 2
 	NumConns int
 
+	// Maximum number of inflight requests allowed per connection.
+	// Default: 32768 for CQL v3 and newer
+	// Default: 128 for older CQL versions
+	MaxRequestsPerConn int
+
 	// Default consistency level.
 	// Default: Quorum
 	Consistency Consistency
@@ -262,6 +267,7 @@ func NewCluster(hosts ...string) *ClusterConfig {
 		ConnectTimeout:         11 * time.Second,
 		Port:                   9042,
 		NumConns:               2,
+		MaxRequestsPerConn:     0,
 		Consistency:            Quorum,
 		MaxPreparedStmts:       defaultMaxPreparedStmts,
 		MaxRoutingKeyInfo:      1000,

cluster_test.go

@@ -13,6 +13,7 @@ func TestNewCluster_Defaults(t *testing.T) {
 	assertEqual(t, "cluster config timeout", 11*time.Second, cfg.Timeout)
 	assertEqual(t, "cluster config port", 9042, cfg.Port)
 	assertEqual(t, "cluster config num-conns", 2, cfg.NumConns)
+	assertEqual(t, "cluster config max requests per conn", 0, cfg.MaxRequestsPerConn)
 	assertEqual(t, "cluster config consistency", Quorum, cfg.Consistency)
 	assertEqual(t, "cluster config max prepared statements", defaultMaxPreparedStmts, cfg.MaxPreparedStmts)
 	assertEqual(t, "cluster config max routing key info", 1000, cfg.MaxRoutingKeyInfo)

conn.go

@@ -257,7 +257,7 @@ func (s *Session) dialWithoutObserver(ctx context.Context, host *HostInfo, cfg *
 		errorHandler:  errorHandler,
 		compressor:    cfg.Compressor,
 		session:       s,
-		streams:       streams.New(cfg.ProtoVersion),
+		streams:       streams.NewStreamIDGenerator(s.cfg.ProtoVersion, s.cfg.MaxRequestsPerConn),
 		host:          host,
 		isSchemaV2:    true, // Try using "system.peers_v2" until proven otherwise
 		frameObserver: s.frameObserver,

conn_test.go

@@ -14,6 +14,7 @@ import (
 	"crypto/x509"
 	"errors"
 	"fmt"
+	"github.com/gocql/gocql/internal/streams"
 	"io"
 	"io/ioutil"
 	"math/rand"
@@ -24,8 +25,6 @@ import (
 	"sync/atomic"
 	"testing"
 	"time"
-
-	"github.com/gocql/gocql/internal/streams"
 )
 
 const (
@@ -672,6 +671,7 @@ func TestQueryTimeoutClose(t *testing.T) {
 func TestStream0(t *testing.T) {
 	// TODO: replace this with type check
 	const expErr = "gocql: received unexpected frame on stream 0"
+	const maxRequestsPerConn = 13
 
 	var buf bytes.Buffer
 	f := newFramer(nil, protoVersion4)
@@ -685,13 +685,22 @@ func TestStream0(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	srv := NewTestServer(t, defaultProto, context.Background())
+	defer srv.Stop()
+	cluster := testCluster(defaultProto, srv.Address)
+	s, err := cluster.CreateSession()
+	s.cfg.MaxRequestsPerConn = maxRequestsPerConn
+	if err != nil {
+		t.Fatalf("NewCluster: %v", err)
+	}
+
 	conn := &Conn{
 		r:       bufio.NewReader(&buf),
-		streams: streams.New(protoVersion4),
+		streams: streams.NewStreamIDGenerator(defaultProto, s.cfg.MaxRequestsPerConn),
 		logger:  &defaultLogger{},
 	}
 
-	err := conn.recv(context.Background())
+	err = conn.recv(context.Background())
 	if err == nil {
 		t.Fatal("expected to get an error on stream 0")
 	} else if !strings.HasPrefix(err.Error(), expErr) {

connectionpool.go

@@ -79,9 +79,10 @@ func setupTLSConfig(sslOpts *SslOptions) (*tls.Config, error) {
 type policyConnPool struct {
 	session *Session
 
-	port     int
-	numConns int
-	keyspace string
+	port               int
+	numConns           int
+	maxRequestsPerConn int
+	keyspace           string
 
 	mu            sync.RWMutex
 	hostConnPools map[string]*hostConnPool
@@ -141,11 +142,12 @@ func connConfig(cfg *ClusterConfig) (*ConnConfig, error) {
 func newPolicyConnPool(session *Session) *policyConnPool {
 	// create the pool
 	pool := &policyConnPool{
-		session:       session,
-		port:          session.cfg.Port,
-		numConns:      session.cfg.NumConns,
-		keyspace:      session.cfg.Keyspace,
-		hostConnPools: map[string]*hostConnPool{},
+		session:            session,
+		port:               session.cfg.Port,
+		numConns:           session.cfg.NumConns,
+		maxRequestsPerConn: session.cfg.MaxRequestsPerConn,
+		keyspace:           session.cfg.Keyspace,
+		hostConnPools:      map[string]*hostConnPool{},
 	}
 
 	return pool

host_source.go

@@ -402,10 +402,10 @@ func (h *HostInfo) HostnameAndPort() string {
 }
 
 func (h *HostInfo) ConnectAddressAndPort() string {
-        h.mu.Lock()
-        defer h.mu.Unlock()
-        addr, _ := h.connectAddressLocked()
-        return net.JoinHostPort(addr.String(), strconv.Itoa(h.port))
+	h.mu.Lock()
+	defer h.mu.Unlock()
+	addr, _ := h.connectAddressLocked()
+	return net.JoinHostPort(addr.String(), strconv.Itoa(h.port))
 }
 
 func (h *HostInfo) String() string {

internal/streams/streams.go

@@ -19,17 +19,29 @@ type IDGenerator struct {
 	offset  uint32
 }
 
+func NewStreamIDGenerator(protocol, maxRequestsPerConn int) *IDGenerator {
+	if maxRequestsPerConn > 0 {
+		return NewLimited(maxRequestsPerConn)
+	}
+	return New(protocol)
+}
+
 func New(protocol int) *IDGenerator {
 	maxStreams := 128
 	if protocol > 2 {
 		maxStreams = 32768
 	}
+	return NewLimited(maxStreams)
+}
+
+func NewLimited(maxStreams int) *IDGenerator {
+	// Round up maxStreams to a nearest multiple of 64
+	maxStreams = ((maxStreams + 63) / 64) * 64
 
 	buckets := maxStreams / 64
 	// reserve stream 0
 	streams := make([]uint64, buckets)
 	streams[0] = 1 << 63
-
 	return &IDGenerator{
 		NumStreams: maxStreams,
 		streams:    streams,