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

Fix some operating mode state transition rules.

Browse Source
This commit is contained in:
JoelKatz
2013-05-23 18:56:16 -07:00
parent 576ee472bf
commit 7f5a81fee5
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/cpp/ripple/NetworkOPs.cpp
View File

@@ -616,6 +616,12 @@ void NetworkOPs::checkState(const boost::system::error_code& result)
cLog(lsINFO) << "Node count (" << peerList.size() << ") is sufficient."; cLog(lsINFO) << "Node count (" << peerList.size() << ") is sufficient.";
} }
// Check if the last validated ledger forces a change between these states
if (mMode == omSYNCING)
setMode(omSYNCING);
else if (mMode == omCONNECTED)
setMode(omCONNECTED);
if (!mConsensus) if (!mConsensus)
tryStartConsensus(); tryStartConsensus();
@@ -639,14 +645,14 @@ void NetworkOPs::tryStartConsensus()
// there shouldn't be a newer LCL. We need this information to do the next three // there shouldn't be a newer LCL. We need this information to do the next three
// tests. // tests.
if ((mMode == omCONNECTED) && !ledgerChange) if (((mMode == omCONNECTED) || (mMode == omSYNCING)) && !ledgerChange)
{ // count number of peers that agree with us and UNL nodes whose validations we have for LCL { // count number of peers that agree with us and UNL nodes whose validations we have for LCL
// if the ledger is good enough, go to omTRACKING - TODO // if the ledger is good enough, go to omTRACKING - TODO
if (!mNeedNetworkLedger) if (!mNeedNetworkLedger)
setMode(omTRACKING); setMode(omTRACKING);
} }
if ((mMode == omTRACKING) && !ledgerChange ) if (((mMode == omCONNECTED) || (mMode == omTRACKING)) && !ledgerChange)
{ {
// check if the ledger is good enough to go to omFULL // check if the ledger is good enough to go to omFULL
// Note: Do not go to omFULL if we don't have the previous ledger // Note: Do not go to omFULL if we don't have the previous ledger
@@ -1031,7 +1037,6 @@ void NetworkOPs::pubServer()
void NetworkOPs::setMode(OperatingMode om) void NetworkOPs::setMode(OperatingMode om)
{ {
if (mMode == om) return;
if (om == omCONNECTED) if (om == omCONNECTED)
{ {
@@ -1039,6 +1044,15 @@ void NetworkOPs::setMode(OperatingMode om)
om = omSYNCING; om = omSYNCING;
} }
if (om == omSYNCING)
{
if (theApp->getLedgerMaster().getValidatedLedgerAge() >= 60)
om = omCONNECTED;
}
if (mMode == om)
return;
if ((om >= omCONNECTED) && (mMode == omDISCONNECTED)) if ((om >= omCONNECTED) && (mMode == omDISCONNECTED))
mConnectTime = boost::posix_time::second_clock::universal_time(); mConnectTime = boost::posix_time::second_clock::universal_time();