tmp, some prints, some waits in the test

Author: Bouncheck

core/src/main/java/com/datastax/oss/driver/internal/core/channel/ChannelFactory.java

@@ -208,12 +208,14 @@ private void connect(
 
     nettyOptions.afterBootstrapInitialized(bootstrap);
 
+    System.out.println("Calling booststrap connect for " + endPoint);
     ChannelFuture connectFuture = bootstrap.connect(RESOLVER.resolve(endPoint.resolve()));
 
     connectFuture.addListener(
         cf -> {
           if (connectFuture.isSuccess()) {
             Channel channel = connectFuture.channel();
+            System.out.println("new channel from connect future " + channel);
             DriverChannel driverChannel =
                 new DriverChannel(endPoint, channel, context.getWriteCoalescer(), currentVersion);
             // If this is the first successful connection, remember the protocol version and

core/src/main/java/com/datastax/oss/driver/internal/core/control/ControlConnection.java

@@ -336,7 +336,8 @@ private void init(
 
     private CompletionStage<Boolean> reconnect() {
       assert adminExecutor.inEventLoop();
-      Queue<Node> nodes = context.getLoadBalancingPolicyWrapper().newQueryPlan();
+      Queue<Node> nodes = context.getLoadBalancingPolicyWrapper().newControlConnectionQueryPlan();
+      System.out.println("Running reconnect with newControlConnectionQueryPlan");
       CompletableFuture<Boolean> result = new CompletableFuture<>();
       connect(
           nodes,
@@ -356,6 +357,7 @@ private void connect(
         Consumer<Throwable> onFailure) {
       assert adminExecutor.inEventLoop();
       Node node = nodes.poll();
+      System.out.println("Running connect() current node: " + (node == null ? "null" : node.toString()));
       if (node == null) {
         onFailure.accept(AllNodesFailedException.fromErrors(errors));
       } else {

core/src/main/java/com/datastax/oss/driver/internal/core/metadata/LoadBalancingPolicyWrapper.java

@@ -32,6 +32,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -165,6 +166,19 @@ public Queue<Node> newQueryPlan() {
     return newQueryPlan(null, DriverExecutionProfile.DEFAULT_NAME, null);
   }
 
+  @NonNull
+  public Queue<Node> newControlConnectionQueryPlan() {
+    Queue<Node> regularQueryPlan = newQueryPlan();
+    if (regularQueryPlan.isEmpty()) {
+      List<Node> nodes = new ArrayList<>(context.getMetadataManager().getContactPoints());
+      Collections.shuffle(nodes);
+      System.out.println("Returning original contact points: " + Arrays.toString(nodes.toArray()));
+      return new ConcurrentLinkedQueue<>(nodes);
+    } else {
+      return regularQueryPlan;
+    }
+  }
+
   // when it comes in from the outside
   private void onNodeStateEvent(NodeStateEvent event) {
     eventFilter.accept(event);

integration-tests/src/test/java/com/datastax/oss/driver/core/resolver/MockResolverIT.java

@@ -253,7 +253,7 @@ public void run_replace_test_20_times() {
     }
   }
 
-  @Test(expected = NoNodeAvailableException.class)
+  @Test
   public void cannot_reconnect_with_resolved_socket() {
     DriverConfigLoader loader =
         new DefaultProgrammaticDriverConfigLoaderBuilder()
@@ -308,13 +308,23 @@ public void cannot_reconnect_with_resolved_socket() {
       assertThat(filteredNodes).hasSize(1);
     }
     int counter = 0;
-    while (filteredNodes.size() == 1) {
-      counter = (counter + 1) % 253 + 1;
+    for(int xx = 0; xx < 100000; xx++){
+    //while (filteredNodes.size() == 1) {
+      counter = (counter + 1) % 253;
+      if (counter == 0) counter++;
       LOG.warn(
           "Launching another cluster until we lose resolved socket from metadata (run {}).",
           counter);
       try (CcmBridge ccmBridge =
                CcmBridge.builder().withNodes(3).withIpPrefix("127.0."+counter+".").build()) {
+        RESOLVER_FACTORY.updateResponse(
+            "test.cluster.fake",
+            new ValidResponse(
+                new InetAddress[] {
+                    getNodeInetAddress(ccmBridge, 1),
+                    getNodeInetAddress(ccmBridge, 2),
+                    getNodeInetAddress(ccmBridge, 3)
+                }));
         ccmBridge.create();
         ccmBridge.start();
         for (int i = 0; i < 15; i++) {
@@ -343,14 +353,21 @@ public void cannot_reconnect_with_resolved_socket() {
             nodes.stream()
                 .filter(x -> x.toString().contains("test.cluster.fake"))
                 .collect(Collectors.toSet());
+        System.out.println("Filtered nodes size: " + filteredNodes.size());
         if (filteredNodes.size() > 1) {
           fail(
               "Somehow there is more than 1 node in metadata with unresolved hostname. This should not ever happen.");
         }
         if(filteredNodes.size() == 0) {
           System.out.println("pause");
         }
+        try {
+          Thread.sleep(1000 * 15);
+        } catch (InterruptedException e) {
+          throw new RuntimeException(e);
+        }
       }
+
     }
     Iterator<Node> iterator = nodes.iterator();
     while (iterator.hasNext()) {
@@ -381,6 +398,7 @@ public void cannot_reconnect_with_resolved_socket() {
         }
       }
       session.execute("SELECT * FROM system.local");
+
     }
     session.close();
   }