ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-01 00:15:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Give mCompleteLedgers its own lock to avoid a deadlock.

Browse Source
This commit is contained in:
David Schwartz
2013-09-25 13:01:18 -07:00
committed by Vinnie Falco
parent 4a871a5726
commit 69dc722a7a
2 changed files with 61 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/ripple_app/ledger/LedgerMaster.cpp
View File

@@ -227,30 +227,41 @@ TER LedgerMaster::doTransaction (SerializedTransaction::ref txn, TransactionEngi
bool LedgerMaster::haveLedgerRange (uint32 from, uint32 to)
{
ScopedLockType sl (mLock, __FILE__, __LINE__);
ScopedLockType sl (mCompleteLock, __FILE__, __LINE__);
uint32 prevMissing = mCompleteLedgers.prevMissing (to + 1);
return (prevMissing == RangeSet::absent) || (prevMissing < from);
}
bool LedgerMaster::haveLedger (uint32 seq)
{
ScopedLockType sl (mLock, __FILE__, __LINE__);
ScopedLockType sl (mCompleteLock, __FILE__, __LINE__);
return mCompleteLedgers.hasValue (seq);
}
void LedgerMaster::clearLedger (uint32 seq)
{
ScopedLockType sl (mCompleteLock, __FILE__, __LINE__);
return mCompleteLedgers.clearValue (seq);
}
bool LedgerMaster::getFullValidatedRange (uint32& minVal, uint32& maxVal)
{ // Ledgers we have all the nodes for
ScopedLockType sl (mLock, __FILE__, __LINE__);
{
ScopedLockType sl (mLock, __FILE__, __LINE__);
if (!mPubLedger)
return false;
if (!mPubLedger)
return false;
maxVal = mPubLedger->getLedgerSeq ();
maxVal = mPubLedger->getLedgerSeq ();
}
if (maxVal == 0)
return false;
minVal = mCompleteLedgers.prevMissing (maxVal);
{
ScopedLockType sl (mCompleteLock, __FILE__, __LINE__);
minVal = mCompleteLedgers.prevMissing (maxVal);
}
if (minVal == RangeSet::absent)
minVal = maxVal;
@@ -262,17 +273,22 @@ bool LedgerMaster::getFullValidatedRange (uint32& minVal, uint32& maxVal)
bool LedgerMaster::getValidatedRange (uint32& minVal, uint32& maxVal)
{ // Ledgers we have all the nodes for and are indexed
ScopedLockType sl (mLock, __FILE__, __LINE__);
{
ScopedLockType sl (mLock, __FILE__, __LINE__);
if (!mPubLedger)
return false;
if (!mPubLedger)
return false;
maxVal = mPubLedger->getLedgerSeq ();
maxVal = mPubLedger->getLedgerSeq ();
}
if (maxVal == 0)
return false;
minVal = mCompleteLedgers.prevMissing (maxVal);
{
ScopedLockType sl (mCompleteLock, __FILE__, __LINE__);
minVal = mCompleteLedgers.prevMissing (maxVal);
}
if (minVal == RangeSet::absent)
minVal = maxVal;
@@ -330,7 +346,7 @@ void LedgerMaster::tryFill (Job& job, Ledger::pointer ledger)
minHas = seq;
--seq;
if (mCompleteLedgers.hasValue (seq))
if (haveLedger (seq))
break;
}
@@ -342,7 +358,7 @@ void LedgerMaster::tryFill (Job& job, Ledger::pointer ledger)
return;
{
ScopedLockType ml (mLock, __FILE__, __LINE__);
ScopedLockType ml (mCompleteLock, __FILE__, __LINE__);
mCompleteLedgers.setRange (minHas, maxHas);
}
maxHas = minHas;
@@ -360,8 +376,11 @@ void LedgerMaster::tryFill (Job& job, Ledger::pointer ledger)
}
{
ScopedLockType ml (mLock, __FILE__, __LINE__);
ScopedLockType ml (mCompleteLock, __FILE__, __LINE__);
mCompleteLedgers.setRange (minHas, maxHas);
}
{
ScopedLockType ml (mLock, __FILE__, __LINE__);
mFillInProgress = 0;
tryAdvance();
}
@@ -417,7 +436,7 @@ void LedgerMaster::fixMismatch (Ledger::ref ledger)
int invalidate = 0;
for (uint32 lSeq = ledger->getLedgerSeq () - 1; lSeq > 0; --lSeq)
if (mCompleteLedgers.hasValue (lSeq))
if (haveLedger (lSeq))
{
uint256 hash = ledger->getLedgerHash (lSeq);
@@ -435,7 +454,7 @@ void LedgerMaster::fixMismatch (Ledger::ref ledger)
}
}
mCompleteLedgers.clearValue (lSeq);
clearLedger (lSeq);
++invalidate;
}
@@ -454,9 +473,13 @@ void LedgerMaster::setFullLedger (Ledger::pointer ledger, bool isSynchronous, bo
ledger->setFull();
{
ScopedLockType ml (mLock, __FILE__, __LINE__);
mCompleteLedgers.setValue (ledger->getLedgerSeq ());
{
ScopedLockType ml (mCompleteLock, __FILE__, __LINE__);
mCompleteLedgers.setValue (ledger->getLedgerSeq ());
}
ScopedLockType ml (mLock, __FILE__, __LINE__);
ledger->pendSaveValidated (isSynchronous, isCurrent);
@@ -468,7 +491,7 @@ void LedgerMaster::setFullLedger (Ledger::pointer ledger, bool isSynchronous, bo
getApp().getOrderBookDB().setup(ledger);
}
if ((ledger->getLedgerSeq () != 0) && mCompleteLedgers.hasValue (ledger->getLedgerSeq () - 1))
if ((ledger->getLedgerSeq () != 0) && haveLedger (ledger->getLedgerSeq () - 1))
{
// we think we have the previous ledger, double check
Ledger::pointer prevLedger = getLedgerBySeq (ledger->getLedgerSeq () - 1);
@@ -591,7 +614,11 @@ void LedgerMaster::advanceThread()
(getApp().getJobQueue().getJobCount(jtPUBOLDLEDGER) < 10) &&
(mValidLedger->getLedgerSeq() == mPubLedger->getLedgerSeq()))
{ // We are in sync, so can acquire
uint32 missing = mCompleteLedgers.prevMissing(mPubLedger->getLedgerSeq());
uint32 missing;
{
ScopedLockType sl (mCompleteLock, __FILE__, __LINE__);
missing = mCompleteLedgers.prevMissing(mPubLedger->getLedgerSeq());
}
WriteLog (lsTRACE, LedgerMaster) << "tryAdvance discovered missing " << missing;
if ((missing != RangeSet::absent) && (missing > 0) &&
shouldAcquire(mValidLedger->getLedgerSeq(), getConfig().LEDGER_HISTORY, missing) &&
@@ -654,7 +681,7 @@ void LedgerMaster::advanceThread()
WriteLog (lsFATAL, LedgerMaster) << "Unable to find ledger following prevMissing " << missing;
WriteLog (lsFATAL, LedgerMaster) << "Pub:" << mPubLedger->getLedgerSeq() << " Val:" << mValidLedger->getLedgerSeq();
WriteLog (lsFATAL, LedgerMaster) << "Ledgers: " << getApp().getLedgerMaster().getCompleteLedgers();
mCompleteLedgers.clearValue (missing + 1);
clearLedger (missing + 1);
progress = true;
}
sl.lock(__FILE__, __LINE__);

20
src/ripple_app/ledger/LedgerMaster.h
View File

@@ -103,7 +103,7 @@ public:
std::string getCompleteLedgers ()
{
ScopedLockType sl (mLock, __FILE__, __LINE__);
ScopedLockType sl (mCompleteLock, __FILE__, __LINE__);
return mCompleteLedgers.toString ();
}
@@ -121,19 +121,21 @@ public:
Ledger::pointer getLedgerBySeq (uint32 index)
{
if (mCurrentLedger && (mCurrentLedger->getLedgerSeq () == index))
return mCurrentLedger;
{
ScopedLockType sl (mLock, __FILE__, __LINE__);
if (mCurrentLedger && (mCurrentLedger->getLedgerSeq () == index))
return mCurrentLedger;
if (mClosedLedger && (mClosedLedger->getLedgerSeq () == index))
return mClosedLedger;
if (mClosedLedger && (mClosedLedger->getLedgerSeq () == index))
return mClosedLedger;
}
Ledger::pointer ret = mLedgerHistory.getLedgerBySeq (index);
if (ret)
return ret;
ScopedLockType ml (mLock, __FILE__, __LINE__);
mCompleteLedgers.clearValue (index);
clearLedger (index);
return ret;
}
@@ -153,7 +155,7 @@ public:
void setLedgerRangePresent (uint32 minV, uint32 maxV)
{
ScopedLockType sl (mLock, __FILE__, __LINE__);
ScopedLockType sl (mCompleteLock, __FILE__, __LINE__);
mCompleteLedgers.setRange (minV, maxV);
}
@@ -164,6 +166,7 @@ public:
bool haveLedgerRange (uint32 from, uint32 to);
bool haveLedger (uint32 seq);
void clearLedger (uint32 seq);
bool getValidatedRange (uint32& minVal, uint32& maxVal);
bool getFullValidatedRange (uint32& minVal, uint32& maxVal);
@@ -221,6 +224,7 @@ private:
CanonicalTXSet mHeldTransactions;
LockType mCompleteLock;
RangeSet mCompleteLedgers;
int mMinValidations; // The minimum validations to publish a ledger