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

Add file changes that I accidentally failed to commit; fix naming issue in worker.

This commit is contained in:
A.J. Beamon 2019-03-27 08:41:19 -07:00
parent 71e2fdafb8
commit 91014d4529
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdbserver/Ratekeeper.actor.cpp
View File

@ -294,7 +294,7 @@ ACTOR Future<Void> trackEachStorageServer(
ACTOR Future<Void> monitorServerListChange(
Reference<AsyncVar<ServerDBInfo>> dbInfo,
PromiseStream< std::pair<UID, Optional<StorageServerInterface>> > serverChanges) {
state Database db = openDBOnServer(dbInfo, TaskRateKeeper, true, true);
state Database db = openDBOnServer(dbInfo, TaskRatekeeper, true, true);
state std::map<UID, StorageServerInterface> oldServers;
state Transaction tr(db);
@ -394,7 +394,7 @@ void updateRate(RatekeeperData* self, RatekeeperLimits* limits) {
//inputRate = std::max( inputRate, actualTps / SERVER_KNOBS->MAX_TRANSACTIONS_PER_BYTE );
/*if( g_random->random01() < 0.1 ) {
std::string name = "RateKeeperUpdateRate" + limits.context;
std::string name = "RatekeeperUpdateRate" + limits.context;
TraceEvent(name, ss.id)
.detail("MinFreeSpace", minFreeSpace)
.detail("SpringBytes", springBytes)
@ -633,7 +633,7 @@ ACTOR Future<Void> configurationMonitor(Reference<AsyncVar<ServerDBInfo>> dbInfo
}
}
ACTOR Future<Void> rateKeeper(RatekeeperInterface rkInterf, Reference<AsyncVar<ServerDBInfo>> dbInfo) {
ACTOR Future<Void> ratekeeper(RatekeeperInterface rkInterf, Reference<AsyncVar<ServerDBInfo>> dbInfo) {
state RatekeeperData self;
state Future<Void> timeout = Void();
state std::vector<Future<Void>> tlogTrackers;

4
fdbserver/worker.actor.cpp
View File

@ -863,10 +863,10 @@ ACTOR Future<Void> workerServer( Reference<ClusterConnectionFile> connFile, Refe
DUMPTOKEN( recruited.getRateInfo );
DUMPTOKEN( recruited.haltRatekeeper );
Future<Void> ratekeeper = ratekeeper( recruited, dbInfo );
Future<Void> ratekeeperProcess = ratekeeper(recruited, dbInfo);
errorForwarders.add(
forwardError(errors, Role::RATEKEEPER, recruited.id(),
setWhenDoneOrError(ratekeeper, rkInterf, Optional<RatekeeperInterface>())));
setWhenDoneOrError(ratekeeperProcess, rkInterf, Optional<RatekeeperInterface>())));
rkInterf->set(Optional<RatekeeperInterface>(recruited));
}
TraceEvent("Ratekeeper_InitRequest", req.reqId).detail("RatekeeperId", recruited.id());