Merge pull request #357 from riptano/1.10.1_prep

mpenick · web-flow · commit 5ea0c26c3664 · 2019-12-11T10:54:48.000-05:00
1.10.1 prep
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,31 @@
+1.10.1
+===========
+
+Bug Fixes
+--------
+* [CPP-849] Error result doesn't allow access to keyspace, table, and function
+  data
+* [CPP-851] Disable deprecated warnings for std::ptr_fun
+* [CPP-879] Allow remote hosts to come back up even if policy ignores down hosts
+  (community PR from kw217)
+
+Other
+--------
+* [CPP-220] Remove use of external Boost from unit and integration tests. 
+  * We ported all integration tests from Boost to Google test. This includes
+    several JIRA issues included in the [CPP-220] epic.
+* [CPP-853] Correct linking libraries for unix based OS when using
+  CASS_USE_STATIC_LIBS=On 
+* [CPP-859] Remove vc_build.bat scripts and update building documentation
+* [CPP-872] Fix GCC 9.2+ build
+* [CPP-878] Correct compile flags for libraries and executable
+* [CPP-882] Correct pthread compiler flag for older CMake versions
+
+Community
+--------
+* Fix build error when compiling without an SSL implementation (kmaragon)
+ (community PR from kw217)
+
 1.10.0
 ===========
 
diff --git a/cpp-driver/CHANGELOG.md b/cpp-driver/CHANGELOG.md
@@ -1,25 +1,52 @@
+2.14.1
+===========
+
+Bug Fixes
+--------
+* [CPP-849] Error result doesn't allow access to keyspace, table, and function
+  data
+* [CPP-851] Disable deprecated warnings for std::ptr_fun
+* [CPP-879] Allow remote hosts to come back up even if policy ignores down hosts
+  (community PR from kw217)
+
+Other
+--------
+* [CPP-220] Remove use of external Boost from unit and integration tests. 
+  * We ported all integration tests from Boost to Google test. This includes
+    several JIRA issues included in the [CPP-220] epic.
+* [CPP-853] Correct linking libraries for unix based OS when using
+  CASS_USE_STATIC_LIBS=On 
+* [CPP-859] Remove vc_build.bat scripts and update building documentation
+* [CPP-872] Fix GCC 9.2+ build
+* [CPP-878] Correct compile flags for libraries and executable
+* [CPP-882] Correct pthread compiler flag for older CMake versions
+
+Community
+--------
+* Fix build error when compiling without an SSL implementation (kmaragon)
+
 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
 ===========
diff --git a/cpp-driver/cmake/modules/CppDriver.cmake b/cpp-driver/cmake/modules/CppDriver.cmake
@@ -420,13 +420,13 @@ macro(CassUseLibuv)
     message(FATAL_ERROR "Unable to Locate libuv: libuv v1.0.0+ is required")
   endif()
 
-  if (LIBUV_VERSION VERSION_LESS "1.0")
+  if(LIBUV_VERSION VERSION_LESS "1.0")
     message(FATAL_ERROR "Libuv version ${LIBUV_VERSION} is not "
       " supported. Please updgrade to libuv version 1.0 or greater in order to "
       "utilize the driver.")
   endif()
 
-  if (LIBUV_VERSION VERSION_LESS "1.6")
+  if(LIBUV_VERSION VERSION_LESS "1.6")
     message(WARNING "Libuv version ${LIBUV_VERSION} does not support custom "
     "memory allocators (version 1.6 or greater required)")
   endif()
@@ -436,10 +436,16 @@ macro(CassUseLibuv)
   set(CASS_LIBS ${CASS_LIBS} ${LIBUV_LIBRARIES})
 
   # libuv and gtests require thread library
-  set (THREADS_PREFER_PTHREAD_FLAG 1)
+  set(CMAKE_THREAD_PREFER_PTHREAD 1)
+  set(THREADS_PREFER_PTHREAD_FLAG 1)
   find_package(Threads REQUIRED)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_THREAD_LIBS_INIT}")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_THREAD_LIBS_INIT}")
+  if(NOT WIN32 AND ${CMAKE_VERSION} VERSION_LESS "3.1.0")
+    # FindThreads in CMake versions < v3.1.0 do not have the THREADS_PREFER_PTHREAD_FLAG to prefer -pthread
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
+  endif()
 endmacro()
 
 #------------------------
diff --git a/cpp-driver/include/cassandra.h b/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
diff --git a/cpp-driver/src/request_processor.cpp b/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);
     }
   }
 }
diff --git a/cpp-driver/tests/src/unit/tests/test_name_resolver.cpp b/cpp-driver/tests/src/unit/tests/test_name_resolver.cpp
@@ -19,10 +19,6 @@
 #include "callback.hpp"
 #include "name_resolver.hpp"
 
-#ifdef WIN32
-#include "winsock.h"
-#endif
-
 #define RESOLVE_TIMEOUT 2000
 
 using namespace datastax;
@@ -54,21 +50,15 @@ class NameResolverUnitTest : public LoopTest {
 };
 
 TEST_F(NameResolverUnitTest, Simple) {
-  NameResolver::Ptr resolver(create(Address("127.0.0.1", 9042)));
+  NameResolver::Ptr resolver(create(Address("127.254.254.254", 9042)));
   resolver->resolve(loop(), RESOLVE_TIMEOUT);
   run_loop();
   ASSERT_EQ(NameResolver::SUCCESS, status());
-#ifdef WIN32
-  char win_hostname[64];
-  gethostname(win_hostname, 64);
-  EXPECT_EQ(String(win_hostname), hostname());
-#else
-  EXPECT_EQ("localhost", hostname());
-#endif
+  EXPECT_EQ("cpp-driver.hostname.", hostname());
 }
 
 TEST_F(NameResolverUnitTest, Timeout) {
-  NameResolver::Ptr resolver(create(Address("127.0.0.1", 9042)));
+  NameResolver::Ptr resolver(create(Address("127.254.254.254", 9042)));
 
   // Libuv's address resolver uses the uv_work thread pool to handle resolution
   // asynchronously. If we starve all the threads in the uv_work thread pool
@@ -91,7 +81,7 @@ TEST_F(NameResolverUnitTest, Invalid) {
 }
 
 TEST_F(NameResolverUnitTest, Cancel) {
-  NameResolver::Ptr resolver(create(Address("127.0.0.1", 9042)));
+  NameResolver::Ptr resolver(create(Address("127.254.254.254", 9042)));
   resolver->resolve(loop(), RESOLVE_TIMEOUT);
   resolver->cancel();
   run_loop();
diff --git a/cpp-driver/tests/src/unit/tests/test_session.cpp b/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());
diff --git a/include/dse.h b/include/dse.h
@@ -50,7 +50,7 @@
 
 #define DSE_VERSION_MAJOR 1
 #define DSE_VERSION_MINOR 10
-#define DSE_VERSION_PATCH 0
+#define DSE_VERSION_PATCH 1
 #define DSE_VERSION_SUFFIX ""
 
 #ifdef __cplusplus

Original file line number	Diff line number	Diff line change
`@@ -462,9 +462,7 @@ void RequestProcessor::internal_host_ready(const Host::Ptr& host) {`
`462`	`462`	`LoadBalancingPolicy::Vec policies = load_balancing_policies();`
`463`	`463`	`for (LoadBalancingPolicy::Vec::const_iterator it = policies.begin(); it != policies.end();`
`464`	`464`	`++it) {`
`465`		`- if ((*it)->distance(host) != CASS_HOST_DISTANCE_IGNORE) {`
`466`		`- (*it)->on_host_up(host);`
`467`		`- }`
	`465`	`+ (*it)->on_host_up(host);`
`468`	`466`	`}`
`469`	`467`	`}`
`470`	`468`	`}`