CPP-819 - Ensure port is updated on already assigned contact points (#303)

Author: mikefero

cpp-driver/gtests/src/unit/tests/test_cluster.cpp

@@ -1029,3 +1029,41 @@ TEST_F(ClusterUnitTest, NoContactPoints) {
   ASSERT_TRUE(connect_future->error());
   EXPECT_EQ(connect_future->error()->code, CASS_ERROR_LIB_NO_HOSTS_AVAILABLE);
 }
+
+TEST_F(ClusterUnitTest, PortIsAssignedDuringConnection) {
+  mockssandra::SimpleCluster cluster(simple(), 1);
+  ASSERT_EQ(cluster.start_all(), 0);
+
+  AddressVec contact_points;
+  contact_points.push_back(Address("127.0.0.1", -1));
+
+  Future::Ptr connect_future(new Future());
+  ClusterConnector::Ptr connector(
+      new ClusterConnector(contact_points, PROTOCOL_VERSION,
+                           bind_callback(on_connection_reconnect, connect_future.get())));
+
+  ClusterSettings settings; // Default port and metadata resolver
+  connector->with_settings(settings)->connect(event_loop());
+
+  ASSERT_TRUE(connect_future->wait_for(WAIT_FOR_TIME));
+  EXPECT_FALSE(connect_future->error());
+}
+
+TEST_F(ClusterUnitTest, HostIsResolvedAndPortIsAssignedDuringConnection) {
+  mockssandra::SimpleCluster cluster(simple(), 1);
+  ASSERT_EQ(cluster.start_all(), 0);
+
+  AddressVec contact_points;
+  contact_points.push_back(Address("localhost", -1));
+
+  Future::Ptr connect_future(new Future());
+  ClusterConnector::Ptr connector(
+      new ClusterConnector(contact_points, PROTOCOL_VERSION,
+                           bind_callback(on_connection_reconnect, connect_future.get())));
+
+  ClusterSettings settings; // Default port and metadata resolver
+  connector->with_settings(settings)->connect(event_loop());
+
+  ASSERT_TRUE(connect_future->wait_for(WAIT_FOR_TIME));
+  EXPECT_FALSE(connect_future->error());
+}

cpp-driver/src/cluster_config.cpp

@@ -27,7 +27,11 @@ CassCluster* cass_cluster_new() { return CassCluster::to(new ClusterConfig()); }
 CassError cass_cluster_set_port(CassCluster* cluster, int port) {
   if (port <= 0) {
     return CASS_ERROR_LIB_BAD_PARAMS;
+  } else if (cluster->config().cloud_secure_connection_config().is_loaded()) {
+    LOG_ERROR("Port cannot be overridden with cloud secure connection bundle");
+    return CASS_ERROR_LIB_BAD_PARAMS;
   }
+
   cluster->config().set_port(port);
   return CASS_OK;
 }
@@ -117,7 +121,7 @@ CassError cass_cluster_set_contact_points_n(CassCluster* cluster, const char* co
     explode(String(contact_points, contact_points_length), exploded);
     for (Vector<String>::const_iterator it = exploded.begin(), end = exploded.end(); it != end;
          ++it) {
-      cluster->config().contact_points().push_back(Address(*it, cluster->config().port()));
+      cluster->config().contact_points().push_back(Address(*it, -1));
     }
   }
   return CASS_OK;

cpp-driver/src/cluster_metadata_resolver.cpp

@@ -25,23 +25,27 @@ namespace {
 
 class DefaultClusterMetadataResolver : public ClusterMetadataResolver {
 public:
-  DefaultClusterMetadataResolver(uint64_t resolve_timeout_ms)
-      : resolve_timeout_ms_(resolve_timeout_ms) {}
+  DefaultClusterMetadataResolver(uint64_t resolve_timeout_ms, int port)
+      : resolve_timeout_ms_(resolve_timeout_ms)
+      , port_(port) {}
 
 private:
   virtual void internal_resolve(uv_loop_t* loop, const AddressVec& contact_points) {
     inc_ref();
 
     for (AddressVec::const_iterator it = contact_points.begin(), end = contact_points.end();
          it != end; ++it) {
+      // If the port is not set then use the default port value.
+      int port = it->port() <= 0 ? port_ : it->port();
+
       if (it->is_resolved()) {
-        resolved_contact_points_.push_back(*it);
+        resolved_contact_points_.push_back(Address(it->hostname_or_address(), port));
       } else {
         if (!resolver_) {
           resolver_.reset(
               new MultiResolver(bind_callback(&DefaultClusterMetadataResolver::on_resolve, this)));
         }
-        resolver_->resolve(loop, it->hostname_or_address(), it->port(), resolve_timeout_ms_);
+        resolver_->resolve(loop, it->hostname_or_address(), port, resolve_timeout_ms_);
       }
     }
 
@@ -89,12 +93,14 @@ class DefaultClusterMetadataResolver : public ClusterMetadataResolver {
 private:
   MultiResolver::Ptr resolver_;
   const uint64_t resolve_timeout_ms_;
+  const int port_;
 };
 
 } // namespace
 
 ClusterMetadataResolver::Ptr
 DefaultClusterMetadataResolverFactory::new_instance(const ClusterSettings& settings) const {
   return ClusterMetadataResolver::Ptr(new DefaultClusterMetadataResolver(
-      settings.control_connection_settings.connection_settings.socket_settings.resolve_timeout_ms));
+      settings.control_connection_settings.connection_settings.socket_settings.resolve_timeout_ms,
+      settings.port));
 }

cpp-driver/src/cluster_metadata_resolver.hpp

@@ -75,7 +75,7 @@ class ClusterMetadataResolverFactory : public RefCounted<ClusterMetadataResolver
 };
 
 /**
- * This factory creates cluster metaadata resolvers that determine contact points using DNS.
+ * This factory creates cluster metadata resolvers that determine contact points using DNS.
  * Domain names with multiple A-records are expanded into multiple contact points and addresses
  * that are already resolved are passed through.
  */