PCBC-899: ensure the connection will be closed on error (#70)

Author: avsej

bin/build

@@ -71,6 +71,7 @@ end
 CB_PHP_PREFIX = ENV.fetch("CB_PHP_PREFIX", DEFAULT_PHP_PREFIX)
 CB_CC = ENV.fetch("CB_CC", default_cc)
 CB_CXX = ENV.fetch("CB_CXX", default_cxx)
+CB_CMAKE_BUILD_TYPE = ENV.fetch("CMAKE_BUILD_TYPE", "Debug")
 
 run("#{CB_PHP_PREFIX}/bin/php --version || true")
 run("#{CB_PHP_PREFIX}/bin/php --ini || true")
@@ -85,7 +86,7 @@ end
 Dir.chdir(PROJECT_ROOT) do
   run("#{CB_PHP_PREFIX}/bin/phpize")
   run("rm -rf cmake-build") unless ENV.fetch("CB_DO_NOT_CLEAN", false)
-  run("./configure --with-php-config=#{CB_PHP_PREFIX}/bin/php-config CC=#{CB_CC} CXX=#{CB_CXX}")
+  run("./configure --with-php-config=#{CB_PHP_PREFIX}/bin/php-config CC=#{CB_CC} CXX=#{CB_CXX} COUCHBASE_CMAKE_BUILD_TYPE=#{CB_CMAKE_BUILD_TYPE}")
   exit if ENV.fetch("CB_CONFIGURE_ONLY", false)
   run("make clean") unless ENV.fetch("CB_DO_NOT_CLEAN", false)
   ENV["CMAKE_BUILD_PARALLEL_LEVEL"] = ENV.fetch("CB_NUMBER_OF_JOBS", "4")

config.m4

@@ -39,6 +39,7 @@ PHP_ADD_MAKEFILE_FRAGMENT
 AC_CONFIG_COMMANDS_POST([
   echo "
 CMAKE                  : ${CMAKE}
+CMAKE_BUILD_TYPE       : ${COUCHBASE_CMAKE_BUILD_TYPE:-RelWithDebInfo}
 CMAKE_SOURCE_DIRECTORY : ${COUCHBASE_CMAKE_SOURCE_DIRECTORY}
 CMAKE_BUILD_DIRECTORY  : ${COUCHBASE_CMAKE_BUILD_DIRECTORY}
 CMAKE_C_COMPILER       : ${CC}
@@ -51,7 +52,7 @@ COUCHBASE_PHP_LIBDIR   : ${phplibdir}
 COUCHBASE_CMAKE_EXTRA  : ${COUCHBASE_CMAKE_EXTRA}
 "
   ${CMAKE} -S ${COUCHBASE_CMAKE_SOURCE_DIRECTORY} -B${COUCHBASE_CMAKE_BUILD_DIRECTORY} \
-         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+         -DCMAKE_BUILD_TYPE=${COUCHBASE_CMAKE_BUILD_TYPE:-RelWithDebInfo} \
          -DCMAKE_C_COMPILER="${CC}" \
          -DCMAKE_CXX_COMPILER="${CXX}" \
          -DCMAKE_C_FLAGS="${CFLAGS}" \

src/wrapper/connection_handle.cxx

@@ -390,16 +390,7 @@ class connection_handle::impl : public std::enable_shared_from_this<connection_h
 
     ~impl()
     {
-        if (cluster_) {
-            auto barrier = std::make_shared<std::promise<void>>();
-            auto f = barrier->get_future();
-            cluster_->close([barrier]() { barrier->set_value(); });
-            f.wait();
-            if (worker.joinable()) {
-                worker.join();
-            }
-            cluster_.reset();
-        }
+        stop();
     }
 
     [[nodiscard]] std::shared_ptr<couchbase::core::cluster> cluster() const
@@ -412,6 +403,20 @@ class connection_handle::impl : public std::enable_shared_from_this<connection_h
         worker = std::thread([self = shared_from_this()]() { self->ctx_.run(); });
     }
 
+    void stop()
+    {
+        if (cluster_) {
+            auto barrier = std::make_shared<std::promise<void>>();
+            auto f = barrier->get_future();
+            cluster_->close([barrier]() { barrier->set_value(); });
+            f.wait();
+            cluster_.reset();
+            if (worker.joinable()) {
+                worker.join();
+            }
+        }
+    }
+
     std::string cluster_version(const std::string& bucket_name = "")
     {
         auto barrier = std::make_shared<std::promise<couchbase::core::operations::management::cluster_describe_response>>();
@@ -452,6 +457,7 @@ class connection_handle::impl : public std::enable_shared_from_this<connection_h
         auto f = barrier->get_future();
         cluster_->open(origin_, [barrier](std::error_code ec) { barrier->set_value(ec); });
         if (auto ec = f.get()) {
+            stop();
             return { ec, { __LINE__, __FILE__, __func__ } };
         }
         return {};
@@ -3431,7 +3437,7 @@ connection_handle::change_password(zval* return_value, const zend_string* new_pa
 {
     couchbase::core::operations::management::change_password_request request{ cb_string_new(new_password) };
 
-    if(auto e = cb_assign_timeout(request, options); e.ec) {
+    if (auto e = cb_assign_timeout(request, options); e.ec) {
         return e;
     }
 

tests/UserManagerTest.php

@@ -218,8 +218,12 @@ function () use ($username) {
 
         $cluster = new Cluster(self::env()->connectionString(), $options);
 
-        $this->expectException(AuthenticationFailureException::class);
-        $newCluster = new Cluster(self::env()->connectionString(), $newOptions);
+        $this->wrapException(
+            function () use ($newOptions) {
+                new Cluster(self::env()->connectionString(), $newOptions);
+            },
+            AuthenticationFailureException::class
+        );
 
         $manager = $cluster->users();
         $manager->changePassword("newPassword");