Browse Source

Merge pull request #380 from Zariel/fix-policy-race

Ensure we hold a read lock to check hosts
Chris Bannister 10 years ago
parent
commit
3404596a9c
1 changed files with 2 additions and 1 deletions
  1. 2 1
      policies.go

+ 2 - 1
policies.go

@@ -87,12 +87,13 @@ func (r *roundRobinHostPolicy) Pick(qry *Query) NextHost {
 	// to the number of hosts known to this policy
 	var i uint32 = 0
 	return func() *HostInfo {
+		r.mu.RLock()
 		if len(r.hosts) == 0 {
+			r.mu.RUnlock()
 			return nil
 		}
 
 		var host *HostInfo
-		r.mu.RLock()
 		// always increment pos to evenly distribute traffic in case of
 		// failures
 		pos := atomic.AddUint32(&r.pos, 1)