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

Some extra debugging. Don't jump back to the ledger we just left (yeah,

Browse Source 
there was another way that could happen.)
This commit is contained in:
JoelKatz
2012-09-05 07:22:04 -07:00
parent 00199d3915
commit 7785b89b5d
1 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/LedgerConsensus.cpp
View File

@@ -248,23 +248,39 @@ void LedgerConsensus::checkLCL()
{
uint256 netLgr = mPrevLedgerHash;
int netLgrCount = 0;
{
boost::unordered_map<uint256, int> vals = theApp->getValidations().getCurrentValidations();
typedef std::pair<const uint256, int> u256_int_pair;
BOOST_FOREACH(u256_int_pair& it, vals)
boost::unordered_map<uint256, int> vals = theApp->getValidations().getCurrentValidations();
typedef std::pair<const uint256, int> u256_int_pair;
BOOST_FOREACH(u256_int_pair& it, vals)
{
if ((it.second > netLgrCount) && !theApp->getValidations().isDeadLedger(it.first))
{
if ((it.second > netLgrCount) && !theApp->getValidations().isDeadLedger(it.first))
{
netLgr = it.first;
netLgrCount = it.second;
}
netLgr = it.first;
netLgrCount = it.second;
}
}
if (netLgr != mPrevLedgerHash)
{ // LCL change
Log(lsWARNING) << "View of consensus changed during consensus (" << netLgrCount << ")";
const char *status;
switch (mState)
{
case lcsPRE_CLOSE: status="PreClose"; break;
case lcsESTABLISH: status="Establish"; break;
case lcsFINISHED: status="Finised"; break;
case lcsACCEPTED: status="Accepted"; break;
default: status="unknown";
}
Log(lsWARNING) << "View of consensus changed during consensus (" << netLgrCount << ") status="
<< status << ", " << (mHaveCorrectLCL ? "CorrectLCL" : "IncorrectLCL");
Log(lsWARNING) << mPrevLedgerHash << " to " << netLgr;
#ifdef DEBUG
BOOST_FOREACH(u256_int_pair& it, vals)
Log(lsDEBUG) << "V: " << it.first << ", " << it.second;
#endif
if (mHaveCorrectLCL)
theApp->getOPs().consensusViewChange();
handleLCL(netLgr);
@@ -520,7 +536,7 @@ void LedgerConsensus::stateAccepted()
void LedgerConsensus::timerEntry()
{
if ((!mHaveCorrectLCL) || (mState == lcsPRE_CLOSE))
if ((!mHaveCorrectLCL && (mState != lcsACCEPTED)) || (mState == lcsPRE_CLOSE))
checkLCL();
mCurrentMSeconds =