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

Send throttles at all priorities from RK->MP

This commit is contained in:
A.J. Beamon 2020-04-22 13:47:16 -07:00
parent 5258910f86
commit d2504c08c3
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdbclient/TagThrottle.h
View File

@ -36,9 +36,13 @@ namespace ThrottleApi {
enum class Priority {
BATCH,
DEFAULT,
IMMEDIATE
IMMEDIATE,
MIN=BATCH,
MAX=IMMEDIATE
};
const std::array<Priority, (int)Priority::MAX+1> allPriorities = { Priority::BATCH, Priority::DEFAULT, Priority::IMMEDIATE };
const char* priorityToString(Priority priority, bool capitalize=true);
Priority priorityFromReadVersionFlags(int flags);
}

8
fdbserver/Ratekeeper.actor.cpp
View File

@ -1054,13 +1054,13 @@ ACTOR Future<Void> ratekeeper(RatekeeperInterface rkInterf, Reference<AsyncVar<S
reply.throttledTags = PrioritizedTransactionTagMap<ClientTagThrottleLimits>();
for(auto itr = self.throttledTags.begin(); itr != self.throttledTags.end();) {
for(auto &priorityItr : itr->second.throttleData) {
auto &priorityTags = reply.throttledTags.get()[priorityItr.first]; // TODO: report all priorities, not just those at the throttle priority
Optional<std::pair<double, double>> clientRate = itr->second.getClientRate(priorityItr.first);
for(auto priority : ThrottleApi::allPriorities) {
Optional<std::pair<double, double>> clientRate = itr->second.getClientRate(priority);
if(clientRate.present()) {
auto &priorityTags = reply.throttledTags.get()[priority];
priorityTags.try_emplace(itr->first, ClientTagThrottleLimits(clientRate.get().first, clientRate.get().second));
}
else if(priorityItr.first == ThrottleApi::Priority::BATCH) {
else if(priority == ThrottleApi::Priority::MIN) {
itr = self.throttledTags.erase(itr);
break;
}