Ensure updateCreatedPools does not add pools for suspected hosts (JAVA-593).

olim7t · olim7t · commit 68408c05779a · 2014-12-19T00:33:46.000+01:00
The check in replacePool is not part of the fix, but it was added
as a security measure since it was where connections were leaked.
diff --git a/driver-core/CHANGELOG.rst b/driver-core/CHANGELOG.rst
@@ -17,6 +17,8 @@ CHANGELOG
 - [bug] Prevent faulty control connection from ignoring reconnecting hosts
   (JAVA-587)
 - temporarily revert "Add idle timeout to the connection pool" (JAVA-419)
+- [bug] Ensure updateCreatedPools does not add pools for suspected hosts
+  (JAVA-593)
 
 
 2.0.8:
diff --git a/driver-core/src/main/java/com/datastax/driver/core/SessionManager.java b/driver-core/src/main/java/com/datastax/driver/core/SessionManager.java
@@ -15,7 +15,6 @@
  */
 package com.datastax.driver.core;
 
-import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.util.*;
@@ -30,7 +29,6 @@
 import org.slf4j.LoggerFactory;
 
 
-import com.datastax.driver.core.exceptions.AuthenticationException;
 import com.datastax.driver.core.exceptions.DriverInternalError;
 import com.datastax.driver.core.exceptions.UnsupportedFeatureException;
 import com.datastax.driver.core.policies.LoadBalancingPolicy;
@@ -270,7 +268,11 @@ private boolean replacePool(Host host, HostDistance distance, HostConnectionPool
                 return false;
 
             HostConnectionPool newPool = new HostConnectionPool(host, distance, this);
-            pools.put(host, newPool);
+            previous = pools.put(host, newPool);
+            if (previous != null && !previous.isClosed()) {
+                logger.warn("Replacing a pool that wasn't closed. Closing it now, but this was not expected.");
+                previous.closeAsync();
+            }
 
             // If we raced with a session shutdown, ensure that the pool will be closed.
             if (isClosing)
@@ -348,7 +350,7 @@ void updateCreatedPools(ListeningExecutorService executor) {
                 HostConnectionPool pool = pools.get(h);
 
                 if (pool == null) {
-                    if (dist != HostDistance.IGNORED && h.isUp())
+                    if (dist != HostDistance.IGNORED && h.state == Host.State.UP)
                         poolCreationFutures.add(maybeAddPool(h, executor));
                 } else if (dist != pool.hostDistance) {
                     if (dist == HostDistance.IGNORED) {
@@ -381,7 +383,7 @@ void updateCreatedPools(Host h, ListeningExecutorService executor) {
 
         try {
             if (pool == null) {
-                if (dist != HostDistance.IGNORED && h.isUp())
+                if (dist != HostDistance.IGNORED && h.state == Host.State.UP)
                     maybeAddPool(h, executor).get();
             } else if (dist != pool.hostDistance) {
                 if (dist == HostDistance.IGNORED) {
