Remove obsolete history mode from Config, and state rebuild functionality from LedgerManager

Author: marta-lokhova

src/herder/HerderImpl.cpp

@@ -306,7 +306,7 @@ HerderImpl::processExternalized(uint64 slotIndex, StellarValue const& value,
         mPendingEnvelopes.getTxSet(value.txSetHash);
 
     // save the SCP messages in the database
-    if (mApp.getConfig().MODE_STORES_HISTORY_MISC)
+    if (mApp.getConfig().modeStoresHistory())
     {
         ZoneNamedN(updateSCPHistoryZone, "update SCP history", true);
         if (slotIndex != 0)

src/ledger/LedgerManagerImpl.cpp

@@ -328,50 +328,24 @@ LedgerManagerImpl::loadLastKnownLedger(bool restoreBucketlist)
     // Step 2. Restore LedgerHeader from DB based on the ledger hash derived
     // earlier, or verify we're at genesis if in no-history mode
     std::optional<LedgerHeader> latestLedgerHeader;
-    if (mApp.getConfig().MODE_STORES_HISTORY_LEDGERHEADERS)
+    auto currentLedger =
+        LedgerHeaderUtils::loadByHash(getDatabase(), lastLedgerHash);
+    if (!currentLedger)
     {
-        if (mRebuildInMemoryState)
-        {
-            LedgerHeader lh;
-            CLOG_INFO(Ledger,
-                      "Setting empty ledger while core rebuilds state: {}",
-                      ledgerAbbrev(lh));
-            setLedgerTxnHeader(lh, mApp);
-            latestLedgerHeader = lh;
-        }
-        else
-        {
-            auto currentLedger =
-                LedgerHeaderUtils::loadByHash(getDatabase(), lastLedgerHash);
-            if (!currentLedger)
-            {
-                throw std::runtime_error("Could not load ledger from database");
-            }
-
-            if (currentLedger->ledgerSeq != has.currentLedger)
-            {
-                throw std::runtime_error("Invalid database state: last known "
-                                         "ledger does not agree with HAS");
-            }
-
-            CLOG_INFO(Ledger, "Loaded LCL header from database: {}",
-                      ledgerAbbrev(*currentLedger));
-            setLedgerTxnHeader(*currentLedger, mApp);
-            latestLedgerHeader = *currentLedger;
-        }
+        throw std::runtime_error("Could not load ledger from database");
     }
-    else
+
+    if (currentLedger->ledgerSeq != has.currentLedger)
     {
-        // In no-history mode, this method should only be called when
-        // the LCL is genesis.
-        releaseAssertOrThrow(getLCLState().ledgerHeader.hash == lastLedgerHash);
-        releaseAssertOrThrow(getLCLState().ledgerHeader.header.ledgerSeq ==
-                             GENESIS_LEDGER_SEQ);
-        CLOG_INFO(Ledger, "LCL is genesis: {}",
-                  ledgerAbbrev(getLCLState().ledgerHeader));
-        latestLedgerHeader = getLCLState().ledgerHeader.header;
+        throw std::runtime_error("Invalid database state: last known "
+                                 "ledger does not agree with HAS");
     }
 
+    CLOG_INFO(Ledger, "Loaded LCL header from database: {}",
+              ledgerAbbrev(*currentLedger));
+    setLedgerTxnHeader(*currentLedger, mApp);
+    latestLedgerHeader = *currentLedger;
+
     releaseAssert(latestLedgerHeader.has_value());
 
     auto missing = mApp.getBucketManager().checkForMissingBucketsFiles(has);
@@ -947,7 +921,7 @@ LedgerManagerImpl::applyLedger(LedgerCloseData const& ledgerData,
     // Subtle: after this call, `header` is invalidated, and is not safe to use
     auto txResultSet = applyTransactions(*applicableTxSet, mutableTxResults,
                                          ltx, ledgerCloseMeta);
-    if (mApp.getConfig().MODE_STORES_HISTORY_MISC)
+    if (mApp.getConfig().modeStoresHistory())
     {
         auto ledgerSeq = ltx.loadHeader().current().ledgerSeq;
         mApp.getHistoryManager().appendTransactionSet(ledgerSeq, txSet,
@@ -1758,14 +1732,10 @@ LedgerManagerImpl::storePersistentStateAndLedgerHeaderInDB(
 
     mApp.getPersistentState().setState(PersistentState::kHistoryArchiveState,
                                        has.toString(), sess);
-
-    if (mApp.getConfig().MODE_STORES_HISTORY_LEDGERHEADERS && storeHeader)
+    LedgerHeaderUtils::storeInDatabase(mApp.getDatabase(), header, sess);
+    if (appendToCheckpoint)
     {
-        LedgerHeaderUtils::storeInDatabase(mApp.getDatabase(), header, sess);
-        if (appendToCheckpoint)
-        {
-            mApp.getHistoryManager().appendLedgerHeader(header);
-        }
+        mApp.getHistoryManager().appendLedgerHeader(header);
     }
 
     return has;

src/ledger/LedgerManagerImpl.h

@@ -99,7 +99,6 @@ class LedgerManagerImpl : public LedgerManager
     SorobanMetrics mSorobanMetrics;
 
     VirtualClock::time_point mLastClose;
-    bool mRebuildInMemoryState{false};
 
     // Use mutex to guard ledger state during apply
     mutable std::recursive_mutex mLedgerStateMutex;

src/main/ApplicationImpl.cpp

@@ -725,7 +725,7 @@ ApplicationImpl::validateAndLogConfig()
 
     if (getHistoryArchiveManager().publishEnabled())
     {
-        if (!mConfig.modeStoresAllHistory())
+        if (!mConfig.modeStoresHistory())
         {
             throw std::invalid_argument(
                 "Core is not configured to store history, but "

src/main/CommandHandler.cpp

@@ -85,7 +85,7 @@ CommandHandler::CommandHandler(Application& app) : mApp(app)
     }
 
     mServer->add404(std::bind(&CommandHandler::fileNotFound, this, _1, _2));
-    if (mApp.getConfig().modeStoresAnyHistory())
+    if (mApp.getConfig().modeStoresHistory())
     {
         addRoute("maintenance", &CommandHandler::maintenance);
     }

src/main/Config.cpp

@@ -121,7 +121,6 @@ Config::Config() : NODE_SEED(SecretKey::random())
     // non configurable
     MODE_ENABLES_BUCKETLIST = true;
     MODE_STORES_HISTORY_MISC = true;
-    MODE_STORES_HISTORY_LEDGERHEADERS = true;
     MODE_DOES_CATCHUP = true;
     MODE_AUTO_STARTS_OVERLAY = true;
     OP_APPLY_SLEEP_TIME_DURATION_FOR_TESTING =
@@ -2391,15 +2390,9 @@ Config::modeDoesCatchupWithBucketList() const
 }
 
 bool
-Config::modeStoresAllHistory() const
+Config::modeStoresHistory() const
 {
-    return MODE_STORES_HISTORY_LEDGERHEADERS && MODE_STORES_HISTORY_MISC;
-}
-
-bool
-Config::modeStoresAnyHistory() const
-{
-    return MODE_STORES_HISTORY_LEDGERHEADERS || MODE_STORES_HISTORY_MISC;
+    return MODE_STORES_HISTORY_MISC;
 }
 
 bool

src/main/Config.h

@@ -492,9 +492,6 @@ class Config : public std::enable_shared_from_this<Config>
     // fees, and scp history in the database
     bool MODE_STORES_HISTORY_MISC;
 
-    // A config parameter that stores ledger headers in the database
-    bool MODE_STORES_HISTORY_LEDGERHEADERS;
-
     // A config parameter that controls whether core automatically catches up
     // when it has buffered enough input; if false an out-of-sync node will
     // remain out-of-sync, buffering ledgers from the network in memory until
@@ -805,8 +802,7 @@ class Config : public std::enable_shared_from_this<Config>
 
     bool modeDoesCatchupWithBucketList() const;
     bool isPersistingBucketListDBIndexes() const;
-    bool modeStoresAllHistory() const;
-    bool modeStoresAnyHistory() const;
+    bool modeStoresHistory() const;
     void logBasicInfo() const;
     bool parallelLedgerClose() const;
     void setNoListen();

src/main/test/ApplicationUtilsTests.cpp

@@ -91,7 +91,6 @@ class SimulationHelper
         mTestCfg.FORCE_SCP = false;
         mTestCfg.INVARIANT_CHECKS = {};
         mTestCfg.MODE_AUTO_STARTS_OVERLAY = false;
-        mTestCfg.MODE_STORES_HISTORY_LEDGERHEADERS = true;
         mTestCfg.USE_CONFIG_FOR_GENESIS = false;
         mTestCfg.TESTING_UPGRADE_DATETIME = VirtualClock::from_time_t(0);