ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-27 22:45:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

On a ledger jump, properly invalidate prior ledgers and invalidate a backfill in progress.

Browse Source
This commit is contained in:
JoelKatz
2012-12-31 00:25:52 -08:00
parent 40b87e9157
commit 8b8a538a5c
2 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/cpp/ripple/LedgerMaster.cpp
View File

@@ -78,7 +78,6 @@ void LedgerMaster::storeLedger(Ledger::ref ledger)
mLedgerHistory.addAcceptedLedger(ledger, false); mLedgerHistory.addAcceptedLedger(ledger, false);
} }
Ledger::pointer LedgerMaster::closeLedger(bool recover) Ledger::pointer LedgerMaster::closeLedger(bool recover)
{ {
boost::recursive_mutex::scoped_lock sl(mLock); boost::recursive_mutex::scoped_lock sl(mLock);
@@ -208,6 +207,37 @@ void LedgerMaster::resumeAcquiring()
} }
} }
void LedgerMaster::fixMismatch(Ledger::ref ledger)
{
int invalidate = 0;
for (uint32 lSeq = ledger->getLedgerSeq() - 1; lSeq > 0; --lSeq)
if (mCompleteLedgers.hasValue(lSeq))
{
uint256 hash = ledger->getLedgerHash(lSeq);
if (hash.isNonZero())
{ // try to close the seam
Ledger::pointer otherLedger = getLedgerBySeq(lSeq);
if (otherLedger && (otherLedger->getHash() == hash))
{ // we closed the seam
tLog(invalidate != 0, lsWARNING) << "Match at " << lSeq << ", " <<
invalidate << " prior ledgers invalidated";
return;
}
}
mCompleteLedgers.clearValue(lSeq);
if (mMissingSeq == lSeq)
{
mMissingLedger.reset();
mMissingSeq = 0;
}
++invalidate;
}
// all prior ledgers invalidated
tLog(invalidate != 0, lsWARNING) << "All " << invalidate << " prior ledgers invalidated";
}
void LedgerMaster::setFullLedger(Ledger::ref ledger) void LedgerMaster::setFullLedger(Ledger::ref ledger)
{ // A new ledger has been accepted as part of the trusted chain { // A new ledger has been accepted as part of the trusted chain
cLog(lsDEBUG) << "Ledger " << ledger->getLedgerSeq() << " accepted :" << ledger->getHash(); cLog(lsDEBUG) << "Ledger " << ledger->getLedgerSeq() << " accepted :" << ledger->getHash();
@@ -219,15 +249,11 @@ void LedgerMaster::setFullLedger(Ledger::ref ledger)
if ((ledger->getLedgerSeq() != 0) && mCompleteLedgers.hasValue(ledger->getLedgerSeq() - 1)) if ((ledger->getLedgerSeq() != 0) && mCompleteLedgers.hasValue(ledger->getLedgerSeq() - 1))
{ // we think we have the previous ledger, double check { // we think we have the previous ledger, double check
Ledger::pointer prevLedger = getLedgerBySeq(ledger->getLedgerSeq() - 1); Ledger::pointer prevLedger = getLedgerBySeq(ledger->getLedgerSeq() - 1);
if (!prevLedger) if (!prevLedger || (prevLedger->getHash() != ledger->getParentHash()))
{ {
cLog(lsWARNING) << "Ledger " << ledger->getLedgerSeq() - 1 << " missing"; cLog(lsWARNING) << "Acquired ledger invalidates previous ledger: " <<
mCompleteLedgers.clearValue(ledger->getLedgerSeq() - 1); (prevLedger ? "hashMismatch" : "missingLedger");
} fixMismatch(ledger);
else if (prevLedger->getHash() != ledger->getParentHash())
{
cLog(lsWARNING) << "Ledger " << ledger->getLedgerSeq() << " invalidates prior ledger";
mCompleteLedgers.clearValue(prevLedger->getLedgerSeq());
} }
} }

1
src/cpp/ripple/LedgerMaster.h
View File

@@ -93,6 +93,7 @@ public:
void setLedgerRangePresent(uint32 minV, uint32 maxV) { mCompleteLedgers.setRange(minV, maxV); } void setLedgerRangePresent(uint32 minV, uint32 maxV) { mCompleteLedgers.setRange(minV, maxV); }
void addHeldTransaction(const Transaction::pointer& trans); void addHeldTransaction(const Transaction::pointer& trans);
void fixMismatch(Ledger::ref ledger);
bool haveLedgerRange(uint32 from, uint32 to); bool haveLedgerRange(uint32 from, uint32 to);