JAVA-1565: Mark node down when it loses its last connection and was already reconnecting

olim7t · olim7t · commit fcff8e690670 · 2017-08-09T09:36:56.000-07:00
diff --git a/changelog/README.md b/changelog/README.md
@@ -4,6 +4,7 @@
 
 ### 4.0.0-alpha2 (in progress)
 
+- [bug] JAVA-1565: Mark node down when it loses its last connection and was already reconnecting
 - [bug] JAVA-1594: Don't create pool if node comes back up but is ignored
 - [bug] JAVA-1593: Reconnect control connection if current node is removed, forced down or ignored
 - [bug] JAVA-1595: Don't use system.local.rpc_address when refreshing node list
diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/NodeStateManager.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/NodeStateManager.java
@@ -117,6 +117,9 @@ private void onChannelEvent(ChannelEvent event) {
           break;
         case CLOSED:
           node.openConnections -= 1;
+          if (node.openConnections == 0 && node.reconnections > 0) {
+            setState(node, NodeState.DOWN, "it was reconnecting and lost its last connection");
+          }
           break;
         case RECONNECTION_STARTED:
           node.reconnections += 1;
diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/NodeStateManagerTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/metadata/NodeStateManagerTest.java
@@ -482,6 +482,21 @@ public void should_mark_node_down_if_reconnection_starts_with_no_connections() {
     Mockito.verify(eventBus).fire(NodeStateEvent.changed(NodeState.UP, NodeState.DOWN, node1));
   }
 
+  @Test
+  public void should_mark_node_down_if_no_connections_and_reconnection_already_started() {
+    new NodeStateManager(context);
+
+    node1.state = NodeState.UP;
+    node1.openConnections = 1;
+
+    eventBus.fire(ChannelEvent.reconnectionStarted(node1));
+    eventBus.fire(ChannelEvent.channelClosed(node1));
+    waitForPendingAdminTasks();
+
+    assertThat(node1.state).isEqualTo(NodeState.DOWN);
+    Mockito.verify(eventBus).fire(NodeStateEvent.changed(NodeState.UP, NodeState.DOWN, node1));
+  }
+
   @Test
   public void should_keep_node_up_if_reconnection_starts_with_some_connections() {
     new NodeStateManager(context);
