MB-65655 Refactor Fusion mcbp to now only delete a single namespace

The API for deleting namespaces has changed. From previously providing
an except list, now Magma only supports deleting the given namespace.

Linked Magma change:
https://review.couchbase.org/c/magma/+/226743

Change-Id: I84b534c9a99ad283e35aec1dee294d6917d31695
Reviewed-on: https://review.couchbase.org/c/kv_engine/+/226845
Reviewed-by: Trond Norbye <trond.norbye@couchbase.com>
Reviewed-by: Mohammad Zaeem <mohammad.zaeem@couchbase.com>
Tested-by: Build Bot <build@couchbase.com>

Author: rohansuri

daemon/mcbp_executors.cc

@@ -25,7 +25,7 @@
 #include "protocol/mcbp/dcp_expiration.h"
 #include "protocol/mcbp/dcp_mutation.h"
 #include "protocol/mcbp/dcp_system_event_executor.h"
-#include "protocol/mcbp/delete_fusion_namespaces_command_context.h"
+#include "protocol/mcbp/delete_fusion_namespace_command_context.h"
 #include "protocol/mcbp/engine_wrapper.h"
 #include "protocol/mcbp/executors.h"
 #include "protocol/mcbp/gat_context.h"
@@ -693,8 +693,8 @@ static void set_chronicle_auth_token_executor(Cookie& cookie) {
     cookie.obtainContext<SetChronicleAuthTokenCommandContext>(cookie).drive();
 }
 
-static void delete_fusion_namespaces_executor(Cookie& cookie) {
-    cookie.obtainContext<DeleteFusionNamespacesCommandContext>(cookie).drive();
+static void delete_fusion_namespace_executor(Cookie& cookie) {
+    cookie.obtainContext<DeleteFusionNamespaceCommandContext>(cookie).drive();
 }
 
 static void process_bin_noop_response(Cookie&) {
@@ -982,8 +982,8 @@ void initialize_mbcp_lookup_map() {
                   stop_fusion_uploader_executor);
     setup_handler(cb::mcbp::ClientOpcode::SetChronicleAuthToken,
                   set_chronicle_auth_token_executor);
-    setup_handler(cb::mcbp::ClientOpcode::DeleteFusionNamespaces,
-                  delete_fusion_namespaces_executor);
+    setup_handler(cb::mcbp::ClientOpcode::DeleteFusionNamespace,
+                  delete_fusion_namespace_executor);
 
     setup_handler(cb::mcbp::ClientOpcode::StartPersistence,
                   start_persistence_executor);

daemon/mcbp_privileges.cc

@@ -290,7 +290,7 @@ McbpPrivilegeChains::McbpPrivilegeChains() {
     setup(ClientOpcode::StopFusionUploader, require<Privilege::NodeSupervisor>);
     setup(ClientOpcode::SetChronicleAuthToken,
           require<Privilege::NodeSupervisor>);
-    setup(ClientOpcode::DeleteFusionNamespaces,
+    setup(ClientOpcode::DeleteFusionNamespace,
           require<Privilege::NodeSupervisor>);
 
     if (getenv("MEMCACHED_UNIT_TESTS") != nullptr) {

daemon/mcbp_validators.cc

@@ -2902,7 +2902,7 @@ static Status set_chronicle_auth_token_validator(Cookie& cookie) {
     return status;
 }
 
-Status delete_fusion_namespaces_validator(Cookie& cookie) {
+Status delete_fusion_namespace_validator(Cookie& cookie) {
     auto status = McbpValidator::verify_header(cookie,
                                                0,
                                                ExpectedKeyLen::Zero,
@@ -2921,67 +2921,57 @@ Status delete_fusion_namespaces_validator(Cookie& cookie) {
     } catch (const nlohmann::json::exception& e) {
         // Note: Don't log the full payload
         const auto msg = fmt::format(
-                "delete_fusion_namespaces_validator: Invalid json format {}",
+                "delete_fusion_namespace_validator: Invalid json format {}",
                 e.what());
         cookie.setErrorContext(msg);
         return Status::Einval;
     }
 
     if (!json.contains("logstore_uri")) {
         cookie.setErrorContext(
-                "delete_fusion_namespaces_validator: Missing logstore_uri");
+                "delete_fusion_namespace_validator: Missing logstore_uri");
         return Status::Einval;
     }
     if (!json["logstore_uri"].is_string()) {
         cookie.setErrorContext(
-                "delete_fusion_namespaces_validator: logstore_uri not string");
+                "delete_fusion_namespace_validator: logstore_uri not string");
         return Status::Einval;
     }
 
     if (!json.contains("metadatastore_uri")) {
         cookie.setErrorContext(
-                "delete_fusion_namespaces_validator: Missing "
+                "delete_fusion_namespace_validator: Missing "
                 "metadatastore_uri");
         return Status::Einval;
     }
     if (!json["metadatastore_uri"].is_string()) {
         cookie.setErrorContext(
-                "delete_fusion_namespaces_validator: metadatastore_uri not "
+                "delete_fusion_namespace_validator: metadatastore_uri not "
                 "string");
         return Status::Einval;
     }
 
     if (!json.contains("metadatastore_auth_token")) {
         cookie.setErrorContext(
-                "delete_fusion_namespaces_validator: Missing "
+                "delete_fusion_namespace_validator: Missing "
                 "metadatastore_auth_token");
         return Status::Einval;
     }
     if (!json["metadatastore_auth_token"].is_string()) {
         cookie.setErrorContext(
-                "delete_fusion_namespaces_validator: metadatastore_auth_token "
+                "delete_fusion_namespace_validator: metadatastore_auth_token "
                 "not string");
         return Status::Einval;
     }
 
-    if (!json.contains("namespaces")) {
+    if (!json.contains("namespace")) {
         cookie.setErrorContext(
-                "delete_fusion_namespaces_validator: Missing mountPaths");
+                "delete_fusion_namespace_validator: Missing namespace");
         return Status::Einval;
     }
-    if (!json["namespaces"].is_array()) {
+    if (!json["namespace"].is_string()) {
         cookie.setErrorContext(
-                "delete_fusion_namespaces_validator: namespaces not an array");
-        return Status::Einval;
-    }
-    try {
-        std::vector<std::string> paths = json["namespaces"];
-    } catch (const std::exception& e) {
-        const auto msg = fmt::format(
-                "delete_fusion_namespaces_validator: Invalid json '{}' {}",
-                value,
-                e.what());
-        cookie.setErrorContext(msg);
+                "delete_fusion_namespace_validator: namespace not string");
         return Status::Einval;
     }
 
@@ -3299,6 +3289,6 @@ McbpValidator::McbpValidator() {
           stop_fusion_uploader_validator);
     setup(cb::mcbp::ClientOpcode::SetChronicleAuthToken,
           set_chronicle_auth_token_validator);
-    setup(cb::mcbp::ClientOpcode::DeleteFusionNamespaces,
-          delete_fusion_namespaces_validator);
+    setup(cb::mcbp::ClientOpcode::DeleteFusionNamespace,
+          delete_fusion_namespace_validator);
 }

daemon/protocol/mcbp/CMakeLists.txt

@@ -40,8 +40,8 @@ add_library(memcached_daemon_mcbp OBJECT
         dcp_stream_req_executor.cc
         dcp_system_event_executor.cc
         dcp_system_event_executor.h
-        delete_fusion_namespaces_command_context.cc
-        delete_fusion_namespaces_command_context.h
+        delete_fusion_namespace_command_context.cc
+        delete_fusion_namespace_command_context.h
         drop_privilege_executor.cc
         engine_wrapper.cc
         engine_wrapper.h

…ete_fusion_namespaces_command_context.cc …lete_fusion_namespace_command_context.ccdaemon/protocol/mcbp/delete_fusion_namespaces_command_context.cc renamed to daemon/protocol/mcbp/delete_fusion_namespace_command_context.cc daemon/protocol/mcbp/delete_fusion_namespaces_command_context.cc renamed to daemon/protocol/mcbp/delete_fusion_namespace_command_context.cc

@@ -8,7 +8,7 @@
  *   the file licenses/APL2.txt.
  */
 
-#include "delete_fusion_namespaces_command_context.h"
+#include "delete_fusion_namespace_command_context.h"
 
 #include <daemon/concurrency_semaphores.h>
 #include <daemon/cookie.h>
@@ -18,31 +18,31 @@
 #endif
 #include <logger/logger.h>
 
-DeleteFusionNamespacesCommandContext::DeleteFusionNamespacesCommandContext(
+DeleteFusionNamespaceCommandContext::DeleteFusionNamespaceCommandContext(
         Cookie& cookie)
     : BackgroundThreadCommandContext(
               cookie,
-              TaskId::Core_DeleteFusionNamespacesTask,
-              fmt::format("Core_DeleteFusionNamespacesTask:{}",
+              TaskId::Core_DeleteFusionNamespaceTask,
+              fmt::format("Core_DeleteFusionNamespaceTask:{}",
                           cookie.getRequest().getVBucket()),
               ConcurrencySemaphores::instance().fusion_management) {
 }
 
-cb::engine_errc DeleteFusionNamespacesCommandContext::execute() {
+cb::engine_errc DeleteFusionNamespaceCommandContext::execute() {
 #ifdef USE_FUSION
     const auto& req = cookie.getRequest();
     const auto request = nlohmann::json::parse(req.getValueString());
     const auto logstore = request["logstore_uri"];
     const auto metadatastore = request["metadatastore_uri"];
     const auto token = request["metadatastore_auth_token"];
-    const auto namespaces = request["namespaces"];
-    const auto status = magma::Magma::DeleteFusionNamespacesExcept(
-            logstore, metadatastore, token, namespaces);
+    const auto ns = request["namespace"];
+    const auto status = magma::Magma::DeleteFusionNamespace(
+            logstore, metadatastore, token, ns);
     if (status.ErrorCode() != magma::Status::Code::Ok) {
-        LOG_WARNING_CTX("DeleteFusionNamespacesExcept: ",
+        LOG_WARNING_CTX("DeleteFusionNamespace: ",
                         {"logstore_uri", logstore},
                         {"metadatastore_uri", metadatastore},
-                        {"namespaces", namespaces},
+                        {"namespace", ns},
                         {"error", status.String()});
         return cb::engine_errc::failed;
     }

…lete_fusion_namespaces_command_context.h …elete_fusion_namespace_command_context.hdaemon/protocol/mcbp/delete_fusion_namespaces_command_context.h renamed to daemon/protocol/mcbp/delete_fusion_namespace_command_context.h daemon/protocol/mcbp/delete_fusion_namespaces_command_context.h renamed to daemon/protocol/mcbp/delete_fusion_namespace_command_context.h

@@ -12,13 +12,13 @@
 #include "background_thread_command_context.h"
 
 /**
- * Command context for executing DeleteFusionNamespaces requests in a
+ * Command context for executing DeleteFusionNamespace requests in a
  * AUXIO bg-thread and avoiding blocking IO in frontend threads.
  */
-class DeleteFusionNamespacesCommandContext
+class DeleteFusionNamespaceCommandContext
     : public BackgroundThreadCommandContext {
 public:
-    explicit DeleteFusionNamespacesCommandContext(Cookie& cookie);
+    explicit DeleteFusionNamespaceCommandContext(Cookie& cookie);
 
 protected:
     cb::engine_errc execute() override;

docs/fusion.md

@@ -301,10 +301,10 @@ will contain details.
 This status code is used for unexpected internal failure.
 
 
-# 0x77 - Delete Fusion Namespaces
+# 0x77 - Delete Fusion Namespace
 
 The command deletes data from the given FusionLogStore and FusionMetadataStore
-for  all Fusion volumes except those that are specified as a parameter to the call.
+for all Fusion volumes under the given namespace.
 
 The request has:
 * No extras
@@ -331,9 +331,9 @@ Any key not shown in the following sections will be ignored.
   * `"metadatastore_auth_token"`
   * The value is a string
 
-* The Fusion namespaces that must be excluded in the deletion
-  * `"namespaces"`
-  * The value is an array of strings
+* The Fusion namespace under which data for all volumes is to be deleted
+  * `"namespace"`
+  * The value is a string
 
 ### Examples
 
@@ -342,16 +342,7 @@ Any key not shown in the following sections will be ignored.
   "logstore_uri": "uri1",
   "metadatastore_uri": "uri2"
   "metadatastore_auth_token": "some-token"
-  "namespaces": ["namespace-to-preserve", "another-one"]
-}
-```
-
-```
-{
-  "logstore_uri": "uri1",
-  "metadatastore_uri": "uri2"
-  "metadatastore_auth_token": "some-token"
-  "namespaces": []
+  "namespaces": "namespace-to-delete"
 }
 ```
 

executor/tasks.def.h

@@ -80,7 +80,7 @@ TASK(Core_ReleaseFusionStorageSnapshotTask, TaskType::AuxIO, 6)
 TASK(Core_StartFusionUploaderTask, TaskType::AuxIO, 6)
 TASK(Core_StopFusionUploaderTask, TaskType::AuxIO, 6)
 TASK(Core_SetChronicleAuthTokenTask, TaskType::AuxIO, 6)
-TASK(Core_DeleteFusionNamespacesTask, TaskType::AuxIO, 6)
+TASK(Core_DeleteFusionNamespaceTask, TaskType::AuxIO, 6)
 
 // Read/Write IO tasks
 TASK(RollbackTask, TaskType::Writer, 1)

include/mcbp/protocol/opcode.h

@@ -159,7 +159,7 @@ enum class ClientOpcode : uint8_t {
     SyncFusionLogstore = 0x74,
     StartFusionUploader = 0x75,
     StopFusionUploader = 0x76,
-    DeleteFusionNamespaces = 0x77,
+    DeleteFusionNamespace = 0x77,
     ReservedFusion8 = 0x78,
 
     StopPersistence = 0x80,

protocol/mcbp/opcode.cc

@@ -829,8 +829,8 @@ class OpcodeInformationService {
               {"STOP_FUSION_UPLOADER"sv, {Attribute::Supported}});
         setup(ClientOpcode::SetChronicleAuthToken,
               {"SET_CHRONICLE_AUTH_TOKEN"sv, {Attribute::Supported}});
-        setup(ClientOpcode::DeleteFusionNamespaces,
-              {"DELETE_FUSION_NAMESPACES"sv, {Attribute::Supported}});
+        setup(ClientOpcode::DeleteFusionNamespace,
+              {"DELETE_FUSION_NAMESPACE"sv, {Attribute::Supported}});
     }
 
 protected: