Merge remote-tracking branch 'core/2.14.1_prep' into 1.10.1_prep

Author: Michael Penick

cpp-driver/CHANGELOG.md

@@ -1,25 +1,33 @@
+2.14.1
+===========
+
+Bug Fixes
+--------
+* [CPP-879] Allow remote hosts to come back up even if policy ignores down hosts
+  (community PR from kw217)
+
 2.14.0
 ===========
 
 Bug Fixes
 --------
-* [CPP-819] - Ensure port is updated on already assigned contact points
-* [CPP-825] - Cloud should be verifying the peer certificates CN
+* [CPP-819] Ensure port is updated on already assigned contact points
+* [CPP-825] Cloud should be verifying the peer certificates CN
 
 2.14.0-alpha2
 ===========
 
 Features
 --------
-* [CPP-812] - Enable warnings for implicit casts and fix problems
-* [CPP-813] - Detect CaaS and change consistency default
-* [CPP-817] - Provide error if mixed usage of secure connect bundle and contact points/ssl context
+* [CPP-812] Enable warnings for implicit casts and fix problems
+* [CPP-813] Detect CaaS and change consistency default
+* [CPP-817] Provide error if mixed usage of secure connect bundle and contact points/ssl context
 
 Bug Fixes
 --------
-* [CPP-802] - Handle prepared id mismatch when repreparing on the fly
-* [CPP-815] - Schema agreement fails with SNI
-* [CPP-811] - Requests won't complete if they exceed the number of streams on a connection
+* [CPP-802] Handle prepared id mismatch when repreparing on the fly
+* [CPP-815] Schema agreement fails with SNI
+* [CPP-811] Requests won't complete if they exceed the number of streams on a connection
 
 2.14.0-alpha
 ===========

cpp-driver/include/cassandra.h

@@ -53,7 +53,7 @@
 
 #define CASS_VERSION_MAJOR 2
 #define CASS_VERSION_MINOR 14
-#define CASS_VERSION_PATCH 0
+#define CASS_VERSION_PATCH 1
 #define CASS_VERSION_SUFFIX ""
 
 #ifdef __cplusplus

cpp-driver/src/request_processor.cpp

@@ -462,9 +462,7 @@ void RequestProcessor::internal_host_ready(const Host::Ptr& host) {
     LoadBalancingPolicy::Vec policies = load_balancing_policies();
     for (LoadBalancingPolicy::Vec::const_iterator it = policies.begin(); it != policies.end();
          ++it) {
-      if ((*it)->distance(host) != CASS_HOST_DISTANCE_IGNORE) {
-        (*it)->on_host_up(host);
-      }
+      (*it)->on_host_up(host);
     }
   }
 }

cpp-driver/tests/src/unit/tests/test_session.cpp

@@ -935,6 +935,46 @@ TEST_F(SessionUnitTest, DefaultConsistencyExecutionProfileNotUpdated) {
   close(&session);
 }
 
+TEST_F(SessionUnitTest, RemoteDCNodeRecovery) {
+  mockssandra::SimpleCluster cluster(simple(), 1, 1); // 1 local DC node and 1 remote DC node
+  ASSERT_EQ(cluster.start_all(), 0);
+
+  ExecutionProfile profile;
+  Config config;
+  config.set_constant_reconnect(100); // Faster reconnect time to handle node outages
+  config.contact_points().push_back(Address("127.0.0.1", 9042));
+  config.set_load_balancing_policy(new DCAwarePolicy("dc1", 1));
+
+  Session session;
+  connect(config, &session);
+
+  cluster.stop(1); // Force using the remote node
+
+  cluster.stop(2); // Force the remote node down and up
+  cluster.start(2);
+
+  bool remote_dc_node_recovered = false;
+
+  // Wait for the remote DC node to become available
+  for (int i = 0; i < 20; ++i) { // Around 2 seconds
+    QueryRequest::Ptr request(new QueryRequest("blah", 0));
+    request->set_consistency(CASS_CONSISTENCY_ONE); // Don't use a LOCAL consistency
+    request->set_record_attempted_addresses(true);
+    ResponseFuture::Ptr future = session.execute(request, NULL);
+    EXPECT_TRUE(future->wait_for(WAIT_FOR_TIME));
+    if (!future->error() && !future->attempted_addresses().empty() &&
+        Address("127.0.0.2", 9042) == future->attempted_addresses()[0]) {
+      remote_dc_node_recovered = true;
+      break;
+    }
+    test::Utils::msleep(100);
+  }
+
+  EXPECT_TRUE(remote_dc_node_recovered);
+
+  close(&session);
+}
+
 TEST_F(SessionUnitTest, DbaasDetectionUpdateDefaultConsistency) {
   mockssandra::SimpleRequestHandlerBuilder builder;
   builder.on(mockssandra::OPCODE_OPTIONS).execute(new SupportedDbaasOptions());