Handle case where [UP, ADDED] are coalesced together.

tolbertam · olim7t · commit d0d394d3b403 · 2015-08-28T11:24:04.000+02:00
diff --git a/driver-core/src/main/java/com/datastax/driver/core/Cluster.java b/driver-core/src/main/java/com/datastax/driver/core/Cluster.java
@@ -2448,8 +2448,15 @@ public ListenableFuture<?> deliver(List<NodeRefreshRequest> events) {
                             break;
                         case ADDED:
                             Host newHost = metadata.add(address);
-                            if (newHost != null)
+                            if (newHost != null) {
                                 futures.add(schedule(hostAdded(newHost)));
+                            } else {
+                                // If host already existed, retrieve it and check its state, if it's not up schedule a
+                                // hostUp event.
+                                Host existingHost = metadata.getHost(address);
+                                if(!existingHost.isUp())
+                                    futures.add(schedule(hostUp(existingHost)));
+                            }
                             break;
                         case DOWN:
                             // Note that there is a slight risk we can receive the event late and thus
diff --git a/driver-core/src/test/java/com/datastax/driver/core/ReconnectionTest.java b/driver-core/src/test/java/com/datastax/driver/core/ReconnectionTest.java
@@ -69,7 +69,7 @@ public void should_reconnect_after_full_connectivity_loss() throws InterruptedEx
             ccm.start(2);
             ccm.waitForUp(2);
 
-            assertThat(cluster).host(2).comesUpWithin(120, SECONDS);
+            assertThat(cluster).host(2).comesUpWithin(Cluster.NEW_NODE_DELAY_SECONDS*2, SECONDS);
 
             // Give the control connection a few moments to reconnect
             TimeUnit.MILLISECONDS.sleep(reconnectionDelay * 2);
@@ -128,7 +128,7 @@ public void should_keep_reconnecting_on_authentication_error() throws Interrupte
             authProvider.setPassword("cassandra");
 
             // The driver should eventually reconnect to the node
-            assertThat(cluster).host(1).comesUpWithin(120, SECONDS);
+            assertThat(cluster).host(1).comesUpWithin(Cluster.NEW_NODE_DELAY_SECONDS*2, SECONDS);
         } finally {
             if (cluster != null)
                 cluster.close();
@@ -168,7 +168,7 @@ public void should_cancel_reconnection_attempts() throws InterruptedException {
             ccm.waitForUp(2);
 
             // The driver should now see the node as UP again
-            assertThat(cluster).host(2).comesUpWithin(120, SECONDS);
+            assertThat(cluster).host(2).comesUpWithin(Cluster.NEW_NODE_DELAY_SECONDS*2, SECONDS);
 
         } finally {
             if (cluster != null)
@@ -229,7 +229,7 @@ public void should_trigger_one_time_reconnect() throws InterruptedException, IOE
             // Trigger another one-time reconnection attempt (this will succeed). The
             // host should be back up.
             host1.tryReconnectOnce();
-            assertThat(cluster).host(1).comesUpWithin(120, SECONDS);
+            assertThat(cluster).host(1).comesUpWithin(Cluster.NEW_NODE_DELAY_SECONDS*2, SECONDS);
         } finally {
             if (cluster != null)
                 cluster.close();
@@ -285,7 +285,7 @@ public void should_use_connection_from_reconnection_in_pool() {
             // Reset the spy and count the number of connections attempts for 1 reconnect
             reset(socketOptions);
             host1.tryReconnectOnce();
-            assertThat(cluster).host(1).comesUpWithin(120, SECONDS);
+            assertThat(cluster).host(1).comesUpWithin(Cluster.NEW_NODE_DELAY_SECONDS*2, SECONDS);
             // Expect 1 connection from the reconnection attempt  3 for the pools (we need 4
             // but the one from the reconnection attempt gets reused).
             verify(socketOptions, times(4)).getKeepAlive();
