couchbase 4.2.8-dev.1 → 4.2.9

package/deps/couchbase-cxx-client/core/agent_config.hxx

@@ -30,7 +30,7 @@ class retry_strategy;
 namespace couchbase::core
 {
 struct agent_config {
-    core_sdk_shim shim{}; // TODO: remove once refactoring will be finished.
+    core_sdk_shim shim; // TODO: remove once refactoring will be finished.
 
     std::string bucket_name{};
     std::string user_agent{};

package/deps/couchbase-cxx-client/core/agent_group.cxx

@@ -215,5 +215,4 @@ agent_group::diagnostics(diagnostics_options options) -> tl::expected<diagnostic
 {
     return impl_->diagnostics(options);
 }
-
 } // namespace couchbase::core

package/deps/couchbase-cxx-client/core/agent_group.hxx

@@ -36,6 +36,11 @@ namespace asio
 class io_context;
 } // namespace asio
 
+namespace couchbase
+{
+class cluster;
+} // namespace couchbase
+
 namespace couchbase::core
 {
 class agent_group_impl;
@@ -76,4 +81,8 @@ class agent_group
   private:
     std::shared_ptr<agent_group_impl> impl_;
 };
+
+// FIXME: temporary solution for the core API migration. FIT performer needs to access core for KV range APIs
+auto
+make_agent_group(couchbase::cluster public_api_cluster) -> agent_group;
 } // namespace couchbase::core

package/deps/couchbase-cxx-client/core/agent_group_config.hxx

@@ -32,7 +32,7 @@ class retry_strategy;
 namespace couchbase::core
 {
 struct agent_group_config {
-    core_sdk_shim shim{}; // TODO: remove once refactoring will be finished.
+    core_sdk_shim shim; // TODO: remove once refactoring will be finished.
 
     std::string user_agent{};
     std::shared_ptr<retry_strategy> default_retry_strategy{ make_best_effort_retry_strategy() };

package/deps/couchbase-cxx-client/core/bucket.cxx

@@ -20,6 +20,7 @@
 #include "collection_id_cache_entry.hxx"
 #include "core/mcbp/big_endian.hxx"
 #include "core/mcbp/codec.hxx"
+#include "couchbase/bucket.hxx"
 #include "dispatcher.hxx"
 #include "impl/bootstrap_state_listener.hxx"
 #include "mcbp/operation_queue.hxx"
@@ -91,12 +92,12 @@ class bucket_impl
             return req->try_callback(resp, req->idempotent() ? errc::common::unambiguous_timeout : errc::common::ambiguous_timeout);
         }
         if (ec == errc::common::request_canceled) {
-            if (reason == retry_reason::do_not_retry) {
+            if (!req->idempotent() && !allows_non_idempotent_retry(reason)) {
                 // TODO: fix tracing
                 // self->span_->add_tag(tracing::attributes::orphan, "canceled");
                 return req->try_callback(resp, ec);
             }
-            backoff_and_retry(req, retry_reason::node_not_available);
+            backoff_and_retry(req, reason == retry_reason::do_not_retry ? retry_reason::node_not_available : reason);
             return;
         }
         key_value_status_code status{ key_value_status_code::unknown };
@@ -196,7 +197,7 @@ class bucket_impl
 
         auto session = route_request(req);
         if (!session || !session->has_config()) {
-            return defer_command([self = shared_from_this(), req]() { self->direct_dispatch(std::move(req)); });
+            return defer_command([self = shared_from_this(), req]() { self->direct_dispatch(req); });
         }
         if (session->is_stopped()) {
             if (backoff_and_retry(req, retry_reason::node_not_available)) {
@@ -532,6 +533,7 @@ class bucket_impl
     {
         std::vector<topology::configuration::node> added{};
         std::vector<topology::configuration::node> removed{};
+        bool sequence_changed = false;
         {
             std::scoped_lock lock(config_mutex_);
             if (!config_) {
@@ -553,9 +555,21 @@ class bucket_impl
             if (config_) {
                 diff_nodes(config_->nodes, config.nodes, added);
                 diff_nodes(config.nodes, config_->nodes, removed);
+                if (added.empty() && removed.empty() && config.nodes.size() == config_->nodes.size()) {
+                    for (std::size_t i = 0; i < config.nodes.size(); ++i) {
+                        if (config.nodes[i] != config_->nodes[i]) {
+                            sequence_changed = true;
+                            break;
+                        }
+                    }
+                } else {
+                    sequence_changed = true;
+                }
             } else {
+                sequence_changed = true;
                 added = config.nodes;
             }
+            config_.reset();
             config_ = config;
             configured_ = true;
 
@@ -566,7 +580,7 @@ class bucket_impl
                 }
             }
         }
-        if (!added.empty() || !removed.empty()) {
+        if (!added.empty() || !removed.empty() || sequence_changed) {
             std::scoped_lock lock(sessions_mutex_);
             std::map<size_t, io::mcbp_session> new_sessions{};
 
@@ -715,7 +729,7 @@ class bucket_impl
         }
     }
 
-    void ping(std::shared_ptr<diag::ping_collector> collector)
+    void ping(std::shared_ptr<diag::ping_collector> collector, std::optional<std::chrono::milliseconds> timeout)
     {
         std::map<size_t, io::mcbp_session> sessions;
         {
@@ -723,7 +737,7 @@ class bucket_impl
             sessions = sessions_;
         }
         for (const auto& [index, session] : sessions) {
-            session.ping(collector->build_reporter());
+            session.ping(collector->build_reporter(), timeout);
         }
     }
 
@@ -811,9 +825,9 @@ bucket::export_diag_info(diag::diagnostics_result& res) const
 }
 
 void
-bucket::ping(std::shared_ptr<diag::ping_collector> collector)
+bucket::ping(std::shared_ptr<diag::ping_collector> collector, std::optional<std::chrono::milliseconds> timeout)
 {
-    return impl_->ping(std::move(collector));
+    return impl_->ping(std::move(collector), std::move(timeout));
 }
 
 void

package/deps/couchbase-cxx-client/core/bucket.hxx

@@ -26,6 +26,8 @@
 #include <asio/post.hpp>
 #include <asio/ssl.hpp>
 
+#include <chrono>
+#include <optional>
 #include <utility>
 #include <vector>
 
@@ -182,7 +184,7 @@ class bucket
     void on_configuration_update(std::shared_ptr<config_listener> handler);
     void close();
     void export_diag_info(diag::diagnostics_result& res) const;
-    void ping(std::shared_ptr<diag::ping_collector> collector);
+    void ping(std::shared_ptr<diag::ping_collector> collector, std::optional<std::chrono::milliseconds> timeout);
     void defer_command(utils::movable_function<void()> command);
 
     [[nodiscard]] auto name() const -> const std::string&;