MB-66368: Make magma_fusion_namespace_suffix a prefix

Change-Id: I13e75353433801face5734d70fd1ee5b9a9078e3
Reviewed-on: https://review.couchbase.org/c/kv_engine/+/226691
Tested-by: Build Bot <build@couchbase.com>
Reviewed-by: Rohan Suri <rohan.suri@couchbase.com>
Reviewed-by: Jim Walker <jim@couchbase.com>

Author: mohammadzaeem

engines/ep/configuration.json

@@ -1670,9 +1670,9 @@
             "dynamic": true,
             "type": "std::string"
         },
-        "magma_fusion_namespace_suffix": {
+        "magma_fusion_namespace_prefix": {
             "default": "kv",
-            "descr": "The fusion namespace format is <bucket_name>/<bucket_uuid>/<service_suffix>. This parameter encodes the <service_suffix> for KV.",
+            "descr": "The fusion namespace format is <service_prefix>/<bucket_name>/<bucket_uuid>. This parameter encodes the <service_prefix> for KV.",
             "dynamic": false,
             "type": "std::string"
         },

engines/ep/src/ep_engine.cc

@@ -8007,9 +8007,9 @@ EventuallyPersistentEngine::getFusionStorageSnapshotInner(
         return {cb::engine_errc::not_supported, {}};
     }
 
-    const auto fusionNamespace = configuration.getCouchBucket() + "/" +
-                                 configuration.getUuid() + "/" +
-                                 configuration.getMagmaFusionNamespaceSuffix();
+    const auto fusionNamespace = configuration.getMagmaFusionNamespacePrefix() +
+                                 "/" + configuration.getCouchBucket() + "/" +
+                                 configuration.getUuid();
 
     return kvBucket->getRWUnderlying(vbid)->getFusionStorageSnapshot(
             fusionNamespace, vbid, snapshotUuid, validity);
@@ -8022,9 +8022,9 @@ cb::engine_errc EventuallyPersistentEngine::releaseFusionStorageSnapshotInner(
         return cb::engine_errc::not_supported;
     }
 
-    const auto fusionNamespace = configuration.getCouchBucket() + "/" +
-                                 configuration.getUuid() + "/" +
-                                 configuration.getMagmaFusionNamespaceSuffix();
+    const auto fusionNamespace = configuration.getMagmaFusionNamespacePrefix() +
+                                 "/" + configuration.getCouchBucket() + "/" +
+                                 configuration.getUuid();
     return kvBucket->getRWUnderlying(vbid)->releaseFusionStorageSnapshot(
             fusionNamespace, vbid, snapshotUuid);
 }

engines/ep/src/kvstore/magma-kvstore/magma-kvstore_config.cc

@@ -235,8 +235,8 @@ MagmaKVStoreConfig::MagmaKVStoreConfig(Configuration& config,
             "magma_fusion_metadatastore_uri",
             std::make_unique<ConfigChangeListener>(*this));
 
-    fusionNamespace = config.getCouchBucket() + "/" + config.getUuid() + "/" +
-                      config.getMagmaFusionNamespaceSuffix();
+    fusionNamespace = config.getMagmaFusionNamespacePrefix() + "/" +
+                      config.getCouchBucket() + "/" + config.getUuid();
     fusionUploadInterval =
             std::chrono::seconds(config.getMagmaFusionUploadInterval());
     fusionLogCheckpointInterval =

engines/ep/tests/ep_testsuite.cc

@@ -6522,7 +6522,7 @@ static enum test_result test_mb19687_fixed(EngineIface* h) {
               "ep_magma_data_compression_algo",
               "ep_magma_fusion_logstore_uri",
               "ep_magma_fusion_metadatastore_uri",
-              "ep_magma_fusion_namespace_suffix",
+              "ep_magma_fusion_namespace_prefix",
               "ep_magma_fusion_upload_interval",
               "ep_magma_fusion_log_checkpoint_interval",
               "ep_magma_fusion_migration_rate_limit",
@@ -6879,7 +6879,7 @@ static enum test_result test_mb19687_fixed(EngineIface* h) {
               "ep_magma_data_compression_algo",
               "ep_magma_fusion_logstore_uri",
               "ep_magma_fusion_metadatastore_uri",
-              "ep_magma_fusion_namespace_suffix",
+              "ep_magma_fusion_namespace_prefix",
               "ep_magma_fusion_upload_interval",
               "ep_magma_fusion_log_checkpoint_interval",
               "ep_magma_fusion_migration_rate_limit",

engines/ep/tests/module_tests/magma_bucket_tests.cc

@@ -1201,9 +1201,9 @@ TEST_P(STMagmaFusionTest, Config) {
     // Note: namespace not in bucket config, set internally at MagmaKVStore
     // init
     const auto& bucketConfig = engine->getConfiguration();
-    const auto fusionNamespace = bucketConfig.getCouchBucket() + "/" +
-                                 bucketConfig.getUuid() + "/" +
-                                 bucketConfig.getMagmaFusionNamespaceSuffix();
+    const auto fusionNamespace = bucketConfig.getMagmaFusionNamespacePrefix() +
+                                 "/" + bucketConfig.getCouchBucket() + "/" +
+                                 bucketConfig.getUuid();
     EXPECT_EQ(fusionNamespace, kvstoreConfig.getFusionNamespace());
 
     // The following configuration is propagated directly to magma