wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix: the master proxy was too slow to erase a GRV budget deficit if no GRV requests were coming in.

This commit is contained in:
A.J. Beamon 2019-08-14 15:01:09 -07:00
parent b744c4b06e
commit 717ede25b3
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fdbserver/MasterProxyServer.actor.cpp
View File

@ -128,7 +128,7 @@ ACTOR Future<Void> getRate(UID myID, Reference<AsyncVar<ServerDBInfo>> db, int64
when ( wait( leaseTimeout ) ) { when ( wait( leaseTimeout ) ) {
*outTransactionRate = 0; *outTransactionRate = 0;
*outBatchTransactionRate = 0; *outBatchTransactionRate = 0;
//TraceEvent("MasterProxyRate", myID).detail("Rate", 0).detail("BatchRate", 0).detail("Lease", "Expired"); //TraceEvent("MasterProxyRate", myID).detail("Rate", 0.0).detail("BatchRate", 0.0).detail("Lease", "Expired");
leaseTimeout = Never(); leaseTimeout = Never();
} }
} }
@ -156,10 +156,7 @@ ACTOR Future<Void> queueTransactionStartRequests(
stats->txnBatchPriorityStartIn += req.transactionCount; stats->txnBatchPriorityStartIn += req.transactionCount;
if (transactionQueue->empty()) { if (transactionQueue->empty()) {
if (now() - *lastGRVTime > *GRVBatchTime) forwardPromise(GRVTimer, delayJittered(std::max(0.0, *GRVBatchTime - (now() - *lastGRVTime)), TaskPriority::ProxyGRVTimer));
*lastGRVTime = now() - *GRVBatchTime;
forwardPromise(GRVTimer, delayJittered(*GRVBatchTime - (now() - *lastGRVTime), TaskPriority::ProxyGRVTimer));
} }
transactionQueue->push(std::make_pair(req, counter--)); transactionQueue->push(std::make_pair(req, counter--));
@ -1108,7 +1105,9 @@ struct TransactionRateInfo {
TransactionRateInfo(double rate) : rate(rate), limit(0) {} TransactionRateInfo(double rate) : rate(rate), limit(0) {}
void reset(double elapsed) { void reset(double elapsed) {
limit = std::min(0.0,limit) + std::min(rate * elapsed, SERVER_KNOBS->START_TRANSACTION_MAX_TRANSACTIONS_TO_START); limit = std::min(0.0, limit) + rate * elapsed; // Adjust the limit based on the full elapsed interval in order to properly erase a deficit
limit = std::min(limit, rate * std::min(elapsed, SERVER_KNOBS->START_TRANSACTION_BATCH_INTERVAL_MAX)); // Don't allow the rate to exceed what would be allowed in the maximum batch interval
limit = std::min(limit, SERVER_KNOBS->START_TRANSACTION_MAX_TRANSACTIONS_TO_START);
} }
bool canStart(int64_t numAlreadyStarted) { bool canStart(int64_t numAlreadyStarted) {
@ -1170,7 +1169,7 @@ ACTOR static Future<Void> transactionStarter(
waitNext(GRVTimer.getFuture()); waitNext(GRVTimer.getFuture());
// Select zero or more transactions to start // Select zero or more transactions to start
double t = now(); double t = now();
double elapsed = std::min<double>(now() - lastGRVTime, SERVER_KNOBS->START_TRANSACTION_BATCH_INTERVAL_MAX); double elapsed = now() - lastGRVTime;
lastGRVTime = t; lastGRVTime = t;
if(elapsed == 0) elapsed = 1e-15; // resolve a possible indeterminant multiplication with infinite transaction rate if(elapsed == 0) elapsed = 1e-15; // resolve a possible indeterminant multiplication with infinite transaction rate