Merge branch 'feature/fix_single_node_refresh' into develop

Author: dancannon

CHANGELOG.md

@@ -32,6 +32,9 @@ In an attempt to make this library more "idiomatic" some functions have been ren
  - Renamed `WriteChanges` to `ChangeResponse`, this is now a general type and can be used when dealing with changefeeds.
  - Removed depth limit when encoding values using `Expr`
 
+## Fixed
+ - Fixed issue causing nodes to remain unhealthy when host discovery is disabled (#195)
+
 ### Removed
 
  - Removed `CacheSize` and `DataCenter` optional arguments in `TableCreateOpts`.

cluster.go

@@ -206,27 +206,14 @@ func (c *Cluster) connectNodes(hosts []Host) {
 			continue
 		}
 
-		if c.opts.DiscoverHosts {
-			var results []nodeStatus
-			err = cursor.All(&results)
-			if err != nil {
-				continue
-			}
+		var results []nodeStatus
+		err = cursor.All(&results)
+		if err != nil {
+			continue
+		}
 
-			for _, result := range results {
-				node, err := c.connectNodeWithStatus(result)
-				if err == nil {
-					if _, ok := nodeSet[node.ID]; !ok {
-						log.WithFields(logrus.Fields{
-							"id":   node.ID,
-							"host": node.Host.String(),
-						}).Debug("Connected to node")
-						nodeSet[node.ID] = node
-					}
-				}
-			}
-		} else {
-			node, err := c.connectNode(host.String(), []Host{host})
+		for _, result := range results {
+			node, err := c.connectNodeWithStatus(result)
 			if err == nil {
 				if _, ok := nodeSet[node.ID]; !ok {
 					log.WithFields(logrus.Fields{

node.go

@@ -8,6 +8,10 @@ import (
 	p "github.com/dancannon/gorethink/ql2"
 )
 
+const (
+	maxNodeHealth = 100
+)
+
 // Node represents a database server in the cluster
 type Node struct {
 	ID      string
@@ -30,7 +34,7 @@ func newNode(id string, aliases []Host, cluster *Cluster, pool *Pool) *Node {
 		aliases:         aliases,
 		cluster:         cluster,
 		pool:            pool,
-		health:          100,
+		health:          maxNodeHealth,
 		refreshDoneChan: make(chan struct{}),
 	}
 	// Start node refresh loop
@@ -170,14 +174,14 @@ func (n *Node) Refresh() {
 	n.ResetHealth()
 }
 
-// DecrementHealth decreases the nodes health by 1 (the nodes health starts at 100)
+// DecrementHealth decreases the nodes health by 1 (the nodes health starts at maxNodeHealth)
 func (n *Node) DecrementHealth() {
 	atomic.AddInt64(&n.health, -1)
 }
 
-// ResetHealth sets the nodes health back to 100 (fully healthy)
+// ResetHealth sets the nodes health back to maxNodeHealth (fully healthy)
 func (n *Node) ResetHealth() {
-	atomic.StoreInt64(&n.health, 100)
+	atomic.StoreInt64(&n.health, maxNodeHealth)
 }
 
 // IsHealthy checks the nodes health by ensuring that the health counter is above 0.