Review adjustments

scylladb · Oct 8, 2024 · b33da6c · b33da6c
1 parent a357efb
commit b33da6c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/config/DefaultDriverOption.java b/core/src/main/java/com/datastax/oss/driver/api/core/config/DefaultDriverOption.java
@@ -675,7 +675,7 @@ public enum DefaultDriverOption implements DriverOption {
  * <p>Value-type: boolean
  */
  CONTROL_CONNECTION_RECONNECT_CONTACT_POINTS(
- "advanced.control-connection.reconnection.fallback-to-original-contacts"),
+ "advanced.control-connection.reconnection.fallback-to-original-contact-points"),
 
  /**
  * Whether `Session.prepare` calls should be sent to all nodes in the cluster.

diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/control/ControlConnection.java b/core/src/main/java/com/datastax/oss/driver/internal/core/control/ControlConnection.java
@@ -22,6 +22,7 @@
 import com.datastax.oss.driver.api.core.auth.AuthenticationException;
 import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
 import com.datastax.oss.driver.api.core.config.DriverConfig;
+import com.datastax.oss.driver.api.core.config.DriverExecutionProfile;
 import com.datastax.oss.driver.api.core.connection.ReconnectionPolicy;
 import com.datastax.oss.driver.api.core.loadbalancing.NodeDistance;
 import com.datastax.oss.driver.api.core.metadata.Node;
@@ -300,7 +301,10 @@ private void init(
  .withOwnerLogPrefix(logPrefix + "|control")
  .build();
 
- Queue<Node> nodes = context.getLoadBalancingPolicyWrapper().newQueryPlan();
+ Queue<Node> nodes =
+ context
+ .getLoadBalancingPolicyWrapper()
+ .newQueryPlan(null, DriverExecutionProfile.DEFAULT_NAME, null);
 
  connect(
  nodes,

diff --git a/.../main/java/com/datastax/oss/driver/internal/core/metadata/LoadBalancingPolicyWrapper.java b/.../main/java/com/datastax/oss/driver/internal/core/metadata/LoadBalancingPolicyWrapper.java
@@ -169,7 +169,7 @@ public Queue<Node> newQueryPlan() {
  @NonNull
  public Queue<Node> newControlReconnectionQueryPlan() {
  // First try the original way
- Queue<Node> regularQueryPlan = newQueryPlan();
+ Queue<Node> regularQueryPlan = newQueryPlan(null, DriverExecutionProfile.DEFAULT_NAME, null);
  if (!regularQueryPlan.isEmpty()) return regularQueryPlan;
 
  if (context

diff --git a/core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf
@@ -2122,7 +2122,7 @@ datastax-java-driver {
  # Required: yes
  # Modifiable at runtime: yes, the new value will be used for checks issued after the change.
  # Overridable in a profile: no
- fallback-to-original-contacts = false
+ fallback-to-original-contact-points = false
  }
  }
 

diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/resolver/MockResolverIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/resolver/MockResolverIT.java
@@ -353,12 +353,6 @@ public void cannot_reconnect_with_resolved_socket() {
  break;
  }
  }
- /*
- ResultSet rs = session.execute("SELECT * FROM system.local");
- assertThat(rs).isNotNull();
- Row row = rs.one();
- assertThat(row).isNotNull();
- */
  nodes = session.getMetadata().getNodes().values();
  assertThat(nodes).hasSize(3);
  Iterator<Node> iterator = nodes.iterator();