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

Load manager fixes.

Browse Source
This commit is contained in:
JoelKatz
2013-07-03 12:36:37 -07:00
parent da9cd1dcfe
commit bc5781e05d
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cpp/ripple/ripple_LoadManager.cpp
View File

@@ -210,7 +210,8 @@ private:
if (source.isPrivileged ()) // privileged sources never warn/cutoff
return false;
if ((source.mBalance >= mDebitLimit) && (source.mLastWarning == now)) // no need to warn
if ( (source.mBalance >= mDebitWarn) ||
((source.mBalance >= mDebitLimit) && (source.mLastWarning == now)))
return false;
return true;

28
src/cpp/ripple/ripple_Peer.cpp
View File

@@ -198,7 +198,7 @@ PeerImp::PeerImp (boost::asio::io_service& io_service, boost::asio::ssl::context
mCluster (false),
mPeerId (peerID),
mPrivate (false),
mLoad (""),
mLoad (std::string()),
mMinLedger (0),
mMaxLedger (0),
mSocketSsl (io_service, ctx),
@@ -975,6 +975,8 @@ void PeerImp::recvHello (protocol::TMHello& packet)
{
mCluster = true;
mLoad.setPrivileged ();
if (!mNodeName.empty())
mLoad.rename (mNodeName);
WriteLog (lsINFO, Peer) << "Cluster connection to \"" << (mNodeName.empty () ? getIP () : mNodeName)
<< "\" established";
}
@@ -1121,6 +1123,7 @@ void PeerImp::recvTransaction (protocol::TMTransaction& packet, ScopedLock& Mast
if (theApp->getMasterTransaction().fetch(txID, true))
{
WriteLog (lsDEBUG, Peer) << "Peer " << getDisplayName() << " send old TX " << txID;
applyLoadCharge (LT_InvalidRequest);
return;
}
@@ -2217,11 +2220,28 @@ void PeerImp::sendGetPeers ()
void PeerImp::applyLoadCharge (LoadType loadType)
{
// IMPLEMENATION IS INCOMPLETE
// VFALCO TODO This needs to implemented before open sourcing.
if (theApp->getLoadManager ().applyLoadCharge (mLoad, loadType))
{
// UNIMPLEMENTED
// VFALCO TODO This needs to implemented before open sourcing.
if (mCluster)
{
WriteLog (lsWARNING, Peer) << "aLC: " << getDisplayName() << " load from cluster";
}
else if (theApp->getLoadManager ().shouldCutoff(mLoad))
{
WriteLog (lsWARNING, Peer) << "aLC: " << getDisplayName() << " should cutoff";
}
else if (theApp->getLoadManager ().shouldWarn (mLoad))
{
WriteLog (lsWARNING, Peer) << "aLC: " << getDisplayName() << " load warning";
}
else
{
WriteLog (lsWARNING, Peer) << "aLC: " << getDisplayName() << " cannot figure out";
}
}
}