Compute the load for admins correctly.

This commit is contained in:
David Schwartz
2013-07-25 10:44:11 -07:00
parent ebd26474e4
commit 7fbc44a866

View File

@@ -36,8 +36,9 @@ public:
uint32 feeFactor = std::max (mLocalTxnLoadFee, mRemoteTxnLoadFee);
// Let admins pay the normal fee until the local load exceeds four times the remote
if (bAdmin && (feeFactor > mRemoteTxnLoadFee) && (feeFactor < (4 * mRemoteTxnLoadFee)))
feeFactor = mRemoteTxnLoadFee;
uint32 uRemFee = std::max(mRemoteTxnLoadFee, mClusterTxnLoadFee);
if (bAdmin && (feeFactor > uRemFee) && (feeFactor < (4 * uRemFee)))
feeFactor = uRemFee;
{
boost::mutex::scoped_lock sl (mLock);