Switch LedgerStateSnapshot to using LM's snapshot

stellar · Dec 20, 2024 · 21f2b39 · 21f2b39
1 parent 50f7d59
commit 21f2b39
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 3 deletions.
diff --git a/src/ledger/LedgerManager.h b/src/ledger/LedgerManager.h
@@ -96,6 +96,10 @@ class LedgerManager
     virtual LedgerHeaderHistoryEntry const&
     getLastClosedLedgerHeader() const = 0;
 
+    // Get bucketlist snapshot
+    virtual std::shared_ptr<SearchableLiveBucketListSnapshot>
+    getCurrentLedgerStateSnaphot() = 0;
+
     // return the HAS that corresponds to the last closed ledger as persisted in
     // the database
     virtual HistoryArchiveState getLastClosedLedgerHAS() = 0;

diff --git a/src/ledger/LedgerManagerImpl.cpp b/src/ledger/LedgerManagerImpl.cpp
@@ -1253,6 +1253,19 @@ LedgerManagerImpl::maybeResetLedgerCloseMetaDebugStream(uint32_t ledgerSeq)
     }
 }
 
+std::shared_ptr<SearchableLiveBucketListSnapshot>
+LedgerManagerImpl::getCurrentLedgerStateSnaphot()
+{
+    if (!mReadOnlyLedgerStateSnapshot)
+    {
+        mReadOnlyLedgerStateSnapshot =
+            mApp.getBucketManager()
+                .getBucketSnapshotManager()
+                .copySearchableLiveBucketListSnapshot();
+    }
+    return mReadOnlyLedgerStateSnapshot;
+}
+
 void
 LedgerManagerImpl::advanceLedgerPointers(LedgerHeader const& header,
                                          bool debugLog)

diff --git a/src/ledger/LedgerManagerImpl.h b/src/ledger/LedgerManagerImpl.h
@@ -68,6 +68,8 @@ class LedgerManagerImpl : public LedgerManager
     medida::Timer& mMetaStreamWriteTime;
     VirtualClock::time_point mLastClose;
     bool mRebuildInMemoryState{false};
+    std::shared_ptr<SearchableLiveBucketListSnapshot>
+        mReadOnlyLedgerStateSnapshot;
 
     std::unique_ptr<VirtualClock::time_point> mStartCatchup;
     medida::Timer& mCatchupDuration;
@@ -202,5 +204,8 @@ class LedgerManagerImpl : public LedgerManager
     void maybeResetLedgerCloseMetaDebugStream(uint32_t ledgerSeq);
 
     SorobanMetrics& getSorobanMetrics() override;
+
+    std::shared_ptr<SearchableLiveBucketListSnapshot>
+    getCurrentLedgerStateSnaphot() override;
 };
 }
diff --git a/src/ledger/LedgerStateSnapshot.cpp b/src/ledger/LedgerStateSnapshot.cpp
@@ -3,8 +3,8 @@
 // of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
 
 #include "ledger/LedgerStateSnapshot.h"
-#include "bucket/BucketManager.h"
 #include "bucket/BucketSnapshotManager.h"
+#include "ledger/LedgerManager.h"
 #include "ledger/LedgerTxn.h"
 #include "main/Application.h"
 #include "transactions/TransactionFrame.h"
@@ -248,7 +248,8 @@ LedgerSnapshot::LedgerSnapshot(Application& app)
     }
     else
 #endif
-        mGetter = std::make_unique<BucketSnapshotState>(app.getBucketManager());
+        mGetter = std::make_unique<BucketSnapshotState>(
+            app.getLedgerManager().getCurrentLedgerStateSnaphot());
 }
 
 LedgerHeaderWrapper

diff --git a/src/ledger/LedgerStateSnapshot.h b/src/ledger/LedgerStateSnapshot.h
@@ -116,7 +116,8 @@ class BucketSnapshotState : public AbstractLedgerStateSnapshot
     LastClosedLedger const mLastClosedLedger;
 
   public:
-    BucketSnapshotState(BucketManager& bm);
+    BucketSnapshotState(
+        std::shared_ptr<SearchableLiveBucketListSnapshot> snapshot);
     ~BucketSnapshotState() override;
 
     LastClosedLedger const& getLastClosedLedger() const override;