More granular bulk load metrics

Author: SirTyson

Diff for: docs/metrics.md

@@ -44,6 +44,8 @@ bucketlistDB-<X>.bulk.loads                 | meter     | number of entries Buck
 bucketlistDB-live.bulk.inflationWinners     | timer     | time to load inflation winners
 bucketlistDB-live.bulk.poolshareTrustlines  | timer     | time to load poolshare trustlines by accountID and assetID
 bucketlistDB-live.bulk.prefetch             | timer     | time to prefetch
+bucketlistDB-live.bulk.eviction           | timer     | time to load for eviction scan
+bucketlistDB-live.bulk.query              | timer     | time to load for query server
 bucketlistDB-<X>.point.<Y>                | timer     | time to load single entry of type <Y> on BucketList <X> (live/hotArchive)
 bucketlistDB-cache.hit                    | meter     | number of cache hits on Live BucketList Disk random eviction cache
 bucketlistDB-cache.miss                   | meter     | number of cache misses on Live BucketList Disk random eviction cache

Diff for: src/bucket/BucketSnapshot.cpp

@@ -237,7 +237,8 @@ LiveBucketSnapshot::scanForEviction(
 
     auto processQueue = [&]() {
         auto loadResult = populateLoadedEntries(
-            keysToSearch, bl.loadKeysWithLimits(keysToSearch, nullptr));
+            keysToSearch,
+            bl.loadKeysWithLimits(keysToSearch, "eviction", nullptr));
         for (auto& e : maybeEvictQueue)
         {
             // If TTL entry has not yet been deleted

Diff for: src/bucket/SearchableBucketList.cpp

@@ -204,9 +204,9 @@ SearchableLiveBucketListSnapshot::loadInflationWinners(size_t maxWinners,
 std::vector<LedgerEntry>
 SearchableLiveBucketListSnapshot::loadKeysWithLimits(
     std::set<LedgerKey, LedgerEntryIdCmp> const& inKeys,
-    LedgerKeyMeter* lkMeter) const
+    std::string const& label, LedgerKeyMeter* lkMeter) const
 {
-    auto timer = getBulkLoadTimer("prefetch", inKeys.size()).TimeScope();
+    auto timer = getBulkLoadTimer(label, inKeys.size()).TimeScope();
     auto op = loadKeysInternal(inKeys, lkMeter, std::nullopt);
     releaseAssertOrThrow(op);
     return std::move(*op);

Diff for: src/bucket/SearchableBucketList.h

@@ -28,7 +28,7 @@ class SearchableLiveBucketListSnapshot
 
     std::vector<LedgerEntry>
     loadKeysWithLimits(std::set<LedgerKey, LedgerEntryIdCmp> const& inKeys,
-                       LedgerKeyMeter* lkMeter) const;
+                       std::string const& label, LedgerKeyMeter* lkMeter) const;
 
     EvictionResultCandidates scanForEviction(
         uint32_t ledgerSeq, EvictionCounters& counters, EvictionIterator iter,

Diff for: src/bucket/test/BucketIndexTests.cpp

@@ -310,7 +310,7 @@ class BucketIndexTest
 
         // Test bulk load lookup
         auto loadResult =
-            searchableBL->loadKeysWithLimits(mKeysToSearch, nullptr);
+            searchableBL->loadKeysWithLimits(mKeysToSearch, "test", nullptr);
         validateResults(mTestEntries, loadResult);
 
         if (expectedHitRate)
@@ -358,8 +358,8 @@ class BucketIndexTest
                          mKeysToSearch.size());
 
             // Run bulk lookup again
-            auto loadResult2 =
-                searchableBL->loadKeysWithLimits(mKeysToSearch, nullptr);
+            auto loadResult2 = searchableBL->loadKeysWithLimits(
+                mKeysToSearch, "test", nullptr);
             validateResults(mTestEntries, loadResult2);
 
             checkHitRate(expectedHitRate, startingHitCount, startingMissCount,
@@ -403,7 +403,7 @@ class BucketIndexTest
             }
 
             auto blLoad =
-                searchableBL->loadKeysWithLimits(searchSubset, nullptr);
+                searchableBL->loadKeysWithLimits(searchSubset, "test", nullptr);
             validateResults(testEntriesSubset, blLoad);
         }
     }
@@ -422,8 +422,8 @@ class BucketIndexTest
         LedgerKeySet invalidKeys(keysNotInBL.begin(), keysNotInBL.end());
 
         // Test bulk load
-        REQUIRE(searchableBL->loadKeysWithLimits(invalidKeys, nullptr).size() ==
-                0);
+        REQUIRE(searchableBL->loadKeysWithLimits(invalidKeys, "test", nullptr)
+                    .size() == 0);
 
         // Test individual load
         for (auto const& key : invalidKeys)

Diff for: src/ledger/LedgerTxn.cpp

@@ -2950,7 +2950,7 @@ LedgerTxnRoot::Impl::prefetchInternal(UnorderedSet<LedgerKey> const& keys,
         insertIfNotLoaded(keysToSearch, key);
     }
     auto blLoad = getSearchableLiveBucketListSnapshot().loadKeysWithLimits(
-        keysToSearch, lkMeter);
+        keysToSearch, "prefetch", lkMeter);
     cacheResult(populateLoadedEntries(keysToSearch, blLoad, lkMeter));
 
     return total;

Diff for: src/main/QueryServer.cpp

@@ -169,8 +169,8 @@ QueryServer::getLedgerEntryRaw(std::string const& params,
         // Otherwise default to current ledger
         else
         {
-            loadedKeys =
-                bl.loadKeysWithLimits(orderedKeys, /*lkMeter=*/nullptr);
+            loadedKeys = bl.loadKeysWithLimits(orderedKeys, "query",
+                                               /*lkMeter=*/nullptr);
             root["ledgerSeq"] = bl.getLedgerSeq();
         }