Merge pull request #6361 from PierreF/cluster-pool-hang

Fix cluster/pool release of connection

CHANGELOG.md

@@ -38,6 +38,7 @@
 - [#6458](https://github.com/influxdata/influxdb/pull/6458): Make it clear when the CLI version is unknown.
 - [#3883](https://github.com/influxdata/influxdb/issues/3883): Improve query sanitization to prevent a password leak in the logs.
 - [#6462](https://github.com/influxdata/influxdb/pull/6462): Add safer locking to CreateFieldIfNotExists
+- [#6361](https://github.com/influxdata/influxdb/pull/6361): Fix cluster/pool release of connection
 
 ## v0.12.2 [2016-04-20]
 

cluster/pool.go

@@ -132,6 +132,7 @@ func (c *boundedPool) put(conn net.Conn) error {
 		return nil
 	default:
 		// pool is full, close passed connection
+		atomic.AddInt32(&c.total, -1)
 		return conn.Close()
 	}
 }