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

Make ratekeeper one word to match our existing convention

This commit is contained in:
A.J. Beamon 2019-03-27 08:15:19 -07:00
parent 83b2ff8b08
commit d508658569
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbserver/Status.actor.cpp
View File

@ -605,7 +605,7 @@ ACTOR static Future<JsonBuilderObject> processStatusFetcher(
}
if (db->get().ratekeeper.present()) {
roles.addRole("rate_keeper", db->get().ratekeeper.get());
roles.addRole("ratekeeper", db->get().ratekeeper.get());
}
state std::vector<std::pair<MasterProxyInterface, EventMap>>::iterator proxy;

2
fdbserver/WorkerInterface.actor.h
View File

@ -330,7 +330,7 @@ struct Role {
static const Role TESTER;
static const Role LOG_ROUTER;
static const Role DATA_DISTRIBUTOR;
static const Role RATE_KEEPER;
static const Role RATEKEEPER;
std::string roleName;
std::string abbreviation;

8
fdbserver/worker.actor.cpp
View File

@ -858,13 +858,15 @@ ACTOR Future<Void> workerServer( Reference<ClusterConnectionFile> connFile, Refe
recruited = rkInterf->get().get();
TEST(true); // Recruited while already a ratekeeper.
} else {
startRole(Role::RATE_KEEPER, recruited.id(), interf.id());
startRole(Role::RATEKEEPER, recruited.id(), interf.id());
DUMPTOKEN( recruited.waitFailure );
DUMPTOKEN( recruited.getRateInfo );
DUMPTOKEN( recruited.haltRatekeeper );
Future<Void> ratekeeper = rateKeeper( recruited, dbInfo );
errorForwarders.add( forwardError( errors, Role::RATE_KEEPER, recruited.id(), setWhenDoneOrError( ratekeeper, rkInterf, Optional<RatekeeperInterface>() ) ) );
errorForwarders.add(
forwardError(errors, Role::RATEKEEPER, recruited.id(),
setWhenDoneOrError(ratekeeper, rkInterf, Optional<RatekeeperInterface>())));
rkInterf->set(Optional<RatekeeperInterface>(recruited));
}
TraceEvent("Ratekeeper_InitRequest", req.reqId).detail("RatekeeperId", recruited.id());
@ -1279,4 +1281,4 @@ const Role Role::CLUSTER_CONTROLLER("ClusterController", "CC");
const Role Role::TESTER("Tester", "TS");
const Role Role::LOG_ROUTER("LogRouter", "LR");
const Role Role::DATA_DISTRIBUTOR("DataDistributor", "DD");
const Role Role::RATE_KEEPER("RateKeeper", "RK");
const Role Role::RATEKEEPER("Ratekeeper", "RK");