From bbf69b2d0aed00687afcd1df0c8f84a7cd82aac1 Mon Sep 17 00:00:00 2001 From: sfc-gh-tclinkenbeard Date: Fri, 7 Oct 2022 08:17:55 -0700 Subject: [PATCH] Rename TagQueue::runEpoch to TagQueue::releaseTransactions --- fdbserver/GrvProxyServer.actor.cpp | 2 +- fdbserver/TagQueue.actor.cpp | 8 ++++---- fdbserver/include/fdbserver/TagQueue.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fdbserver/GrvProxyServer.actor.cpp b/fdbserver/GrvProxyServer.actor.cpp index 70fa90186a..f1f04581e1 100644 --- a/fdbserver/GrvProxyServer.actor.cpp +++ b/fdbserver/GrvProxyServer.actor.cpp @@ -888,7 +888,7 @@ ACTOR static Future transactionStarter(GrvProxyInterface proxy, elapsed = 1e-15; } - tagQueue.runEpoch(elapsed, defaultQueue, batchQueue); + tagQueue.releaseTransactions(elapsed, defaultQueue, batchQueue); normalRateInfo.startReleaseWindow(); batchRateInfo.startReleaseWindow(); diff --git a/fdbserver/TagQueue.actor.cpp b/fdbserver/TagQueue.actor.cpp index ba808a6633..e0dc9ec7df 100644 --- a/fdbserver/TagQueue.actor.cpp +++ b/fdbserver/TagQueue.actor.cpp @@ -40,9 +40,9 @@ void TagQueue::addRequest(GetReadVersionRequest req) { newRequests.push_back(req); } -void TagQueue::runEpoch(double elapsed, - SpannedDeque& outBatchPriority, - SpannedDeque& outDefaultPriority) { +void TagQueue::releaseTransactions(double elapsed, + SpannedDeque& outBatchPriority, + SpannedDeque& outDefaultPriority) { for (auto& [_, rateInfo] : rateInfos) { rateInfo.startReleaseWindow(); } @@ -128,7 +128,7 @@ ACTOR static Future mockServer(TagQueue* tagQueue) { loop { state double elapsed = (0.009 + 0.002 * deterministicRandom()->random01()); wait(delay(elapsed)); - tagQueue->runEpoch(elapsed, outBatchPriority, outDefaultPriority); + tagQueue->releaseTransactions(elapsed, outBatchPriority, outDefaultPriority); while (!outBatchPriority.empty()) { outBatchPriority.front().reply.send(GetReadVersionReply{}); outBatchPriority.pop_front(); diff --git a/fdbserver/include/fdbserver/TagQueue.h b/fdbserver/include/fdbserver/TagQueue.h index a930319c9c..a72db8bdee 100644 --- a/fdbserver/include/fdbserver/TagQueue.h +++ b/fdbserver/include/fdbserver/TagQueue.h @@ -44,9 +44,9 @@ public: // elapsed indicates the amount of time since the last epoch was run. // If a request is ready to be executed, it is sent to the deque // corresponding to its priority. If not, the request remains queued. - void runEpoch(double elapsed, - SpannedDeque& outBatchPriority, - SpannedDeque& outDefaultPriority); + void releaseTransactions(double elapsed, + SpannedDeque& outBatchPriority, + SpannedDeque& outDefaultPriority); void addRequest(GetReadVersionRequest); };