Added HostDecayDuration and fixed issues with hostpool

Author: dancannon

CHANGELOG.md

@@ -6,13 +6,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
  - Added `UUID` term
  - Added `Values` term
- - Added `IncludeInitial` to `ChangesOpts`
+ - Added `IncludeInitial` and `ChangefeedQueueSize` to `ChangesOpts`
  - Added `UseJSONNumber` to `ConnectOpts` which changes the way the JSON unmarshal works when deserializing JSON with interface{}, it's preferred to use json.Number instead float64 as it preserves the original precision.
+ - Added `HostDecayDuration` to `ConnectOpts` to configure how hosts are selected. For more information see the godoc.
 
 ### Changed
  - Timezones from `time.Time` are now stored in the database, before all times were stored as UTC. To convert a go `time.Time` back to UTC you can call  `t.In(time.UTC)`.
  - Improved host selection to use `hailocab/go-hostpool` to select nodes based on recent responses and timings.
 
+### Deprecated
+ - Deprecated the option `NodeRefreshInterval` in `ConnectOpts`
+
 ## v1.1.4
 ### Added
  - Added root table terms (`r.TableCreate`, `r.TableList` and `r.TableDrop`)

cluster.go

@@ -34,8 +34,7 @@ type Cluster struct {
 // NewCluster creates a new cluster by connecting to the given hosts.
 func NewCluster(hosts []Host, opts *ConnectOpts) (*Cluster, error) {
 	c := &Cluster{
-		// TODO: Make this configurable
-		hp:    hostpool.NewEpsilonGreedy([]string{}, 0, &hostpool.LinearEpsilonValueCalculator{}),
+		hp:    hostpool.NewEpsilonGreedy([]string{}, opts.HostDecayDuration, &hostpool.LinearEpsilonValueCalculator{}),
 		seeds: hosts,
 		opts:  opts,
 	}
@@ -358,7 +357,6 @@ func (c *Cluster) GetNextNode() (*Node, hostpool.HostPoolResponse, error) {
 	defer c.mu.RUnlock()
 
 	nodes := c.nodes
-
 	hpr := c.hp.Get()
 	if n, ok := nodes[hpr.Host()]; ok {
 		if !n.Closed() {

cluster_integration_test.go

@@ -63,7 +63,7 @@ func (s *RethinkSuite) TestClusterRecoverAfterNoNodes(c *test.C) {
 
 func (s *RethinkSuite) TestClusterNodeHealth(c *test.C) {
 	session, err := Connect(ConnectOpts{
-		Addresses:           []string{url, url2, url3},
+		Addresses:           []string{url1, url2, url3},
 		DiscoverHosts:       true,
 		NodeRefreshInterval: time.Second,
 		MaxIdle:             50,
@@ -75,7 +75,7 @@ func (s *RethinkSuite) TestClusterNodeHealth(c *test.C) {
 	failed := 0
 	seconds := 0
 
-	t := time.NewTimer(time.Second * 10)
+	t := time.NewTimer(time.Second * 30)
 	tick := time.NewTicker(time.Second)
 	for {
 		select {

gorethink_test.go

@@ -29,9 +29,9 @@ func init() {
 		url = "localhost:28015"
 	}
 
-	url2 = os.Getenv("RETHINKDB_URL_1")
-	if url2 == "" {
-		url2 = "localhost:28016"
+	url1 = os.Getenv("RETHINKDB_URL_1")
+	if url1 == "" {
+		url1 = "localhost:28016"
 	}
 
 	url2 = os.Getenv("RETHINKDB_URL_2")

ql2/ql2.pb.go

@@ -145,9 +145,10 @@ func (t Term) IndexWait(args ...interface{}) Term {
 
 // ChangesOpts contains the optional arguments for the Changes term
 type ChangesOpts struct {
-	Squash         interface{} `gorethink:"squash,omitempty"`
-	IncludeInitial interface{} `gorethink:"include_initial,omitempty"`
-	IncludeStates  interface{} `gorethink:"include_states,omitempty"`
+	Squash              interface{} `gorethink:"squash,omitempty"`
+	IncludeInitial      interface{} `gorethink:"include_initial,omitempty"`
+	IncludeStates       interface{} `gorethink:"include_states,omitempty"`
+	ChangefeedQueueSize interface{} `gorethink:"changefeed_queue_size,omitempty"`
 }
 
 // ChangesOpts contains the optional arguments for the Changes term

query_table.go

@@ -42,7 +42,13 @@ type ConnectOpts struct {
 	DiscoverHosts bool `gorethink:"discover_hosts,omitempty"`
 	// NodeRefreshInterval is used to determine how often the driver should
 	// refresh the status of a node.
+	//
+	// Deprecated: This function is no longer used due to changes in the
+	// way hosts are selected.
 	NodeRefreshInterval time.Duration `gorethink:"node_refresh_interval,omitempty"`
+	// HostDecayDuration is used by the go-hostpool package to calculate a weighted
+	// score when selecting a host. By default a value of 5 minutes is used.
+	HostDecayDuration time.Duration
 
 	// Indicates whether the cursors running in this session should use json.Number instead of float64 while
 	// unmarshaling documents with interface{}. The default is `false`.