Monitor cluster load.

This commit is contained in:
JoelKatz
2013-07-10 13:19:39 -07:00
parent ea7730a419
commit ec498bf2d2
3 changed files with 17 additions and 5 deletions

View File

@@ -32,19 +32,20 @@ public:
// Scale using load as well as base rate
virtual uint64 scaleFeeLoad (uint64 fee, uint64 baseFee, uint32 referenceFeeUnits, bool bAdmin) = 0;
// VFALCO NOTE These appear to be unused, so I'm hiding the declarations.
// VFALCO NOTE This appears to be unused, so I'm hiding the declaration.
//
//virtual uint32 getRemoteFee () = 0;
//virtual uint32 getLocalFee () = 0;
//virtual void setRemoteFee (uint32) = 0;
virtual uint32 getRemoteFee () = 0;
virtual uint32 getLocalFee () = 0;
virtual uint32 getClusterFee () = 0;
virtual uint32 getLoadBase () = 0;
virtual uint32 getLoadFactor () = 0;
virtual Json::Value getJson (uint64 baseFee, uint32 referenceFeeUnits) = 0;
virtual void setClusterFee (uint32) = 0;
virtual uint32 getClusterFee () = 0;
virtual bool raiseLocalFee () = 0;
virtual bool lowerLocalFee () = 0;
virtual bool isLoadedLocal () = 0;

View File

@@ -77,7 +77,7 @@ public:
uint32 getLoadFactor ()
{
boost::mutex::scoped_lock sl (mLock);
return std::max (mLocalTxnLoadFee, mRemoteTxnLoadFee);
return std::max(mClusterTxnLoadFee, std::max (mLocalTxnLoadFee, mRemoteTxnLoadFee));
}
void setClusterFee (uint32 fee)