[Store] Tenant-first object-level metadata locking (flat group)

mooncake-store/benchmarks/batch_evict_bench.cpp

@@ -169,42 +169,49 @@ class BatchEvictBench {
         const auto base_expiration = now - std::chrono::hours(1);
         size_t ordinal = 0;
 
-        for (size_t shard_idx = 0; shard_idx < MasterService::kNumShards;
-             ++shard_idx) {
-            MasterService::MetadataShardAccessorRW shard(&service, shard_idx);
-            for (auto& [tenant_id, tenant_state] : shard->tenants) {
+        // Objects live in the default tenant's per-tenant route. Walk it via
+        // the ownership registry; per-object access is under the metadata lock.
+        service.tenant_directory_.Visit(
+            [&](const TenantId& tenant_id,
+                const std::shared_ptr<MasterService::TenantState>& handle) {
                 if (tenant_id != TenantId::Default()) {
-                    continue;
+                    return;
                 }
-                for (auto& [key, metadata] : tenant_state.metadata) {
-                    {
-                        SpinLocker locker(&metadata.lock);
-                        metadata.lease_->SetDeadline(
-                            base_expiration +
-                            std::chrono::nanoseconds(ordinal++));
-                    }
-
-                    ++stats.object_count;
-                    if (!metadata.IsLeaseExpired(now)) {
-                        ++stats.unexpired_leases;
-                    }
-                    for (const auto& replica : metadata.GetAllReplicas()) {
-                        if (replica.is_memory_replica()) {
-                            if (replica.is_completed()) {
-                                ++stats.completed_memory_replicas;
+                auto& tenant_state = *handle;
+                tenant_state.VisitObjects(
+                    [&](const std::shared_ptr<mooncake::tenant::ObjectEntry>&
+                            entry) {
+                        if (!entry->has_metadata()) {
+                            return;
+                        }
+                        auto& metadata = *entry->metadata();
+                        {
+                            SpinLocker locker(&metadata.lock);
+                            metadata.lease_->SetDeadline(
+                                base_expiration +
+                                std::chrono::nanoseconds(ordinal++));
+                        }
+
+                        ++stats.object_count;
+                        if (!metadata.IsLeaseExpired(now)) {
+                            ++stats.unexpired_leases;
+                        }
+                        for (const auto& replica : metadata.GetAllReplicas()) {
+                            if (replica.is_memory_replica()) {
+                                if (replica.is_completed()) {
+                                    ++stats.completed_memory_replicas;
+                                } else {
+                                    ++stats.incomplete_replicas;
+                                }
+                                if (replica.get_refcnt() != 0) {
+                                    ++stats.busy_memory_replicas;
+                                }
                             } else {
-                                ++stats.incomplete_replicas;
+                                ++stats.non_memory_replicas;
                             }
-                            if (replica.get_refcnt() != 0) {
-                                ++stats.busy_memory_replicas;
-                            }
-                        } else {
-                            ++stats.non_memory_replicas;
                         }
-                    }
-                }
-            }
-        }
+                    });
+            });
 
         return stats;
     }

mooncake-store/include/kv_event/kv_event_publisher.h

@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "kv_event/kv_event_config.h"
-#include "tenant_id.h"
+#include "tenant/tenant_id.h"
 
 namespace mooncake {
 

mooncake-store/include/local_ssd/manager.h

@@ -13,7 +13,7 @@
 
 #include "local_ssd/persisted_state.h"
 #include "mutex.h"
-#include "tenant_id.h"
+#include "tenant/tenant_id.h"
 #include "types.h"
 
 namespace mooncake {