apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-17 11:22:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

cleaned up default constructed maps

Browse Source
This commit is contained in:
Evan Tschannen 2021-04-26 19:26:25 -07:00
parent a02da36e85
commit 1f98dec1df
1 changed files with 26 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
fdbserver/ClusterController.actor.cpp
View File

@ -1200,8 +1200,7 @@ public:
ProcessClass::Fitness unacceptableFitness, ProcessClass::Fitness unacceptableFitness,
DatabaseConfiguration const& conf, DatabaseConfiguration const& conf,
std::map<Optional<Standalone<StringRef>>, int>& id_used, std::map<Optional<Standalone<StringRef>>, int>& id_used,
std::map<Optional<Standalone<StringRef>>, int> preferredSharing = std::map<Optional<Standalone<StringRef>>, int> preferredSharing = {},
std::map<Optional<Standalone<StringRef>>, int>(),
bool checkStable = false) { bool checkStable = false) {
std::map<std::tuple<ProcessClass::Fitness, int, bool, int>, vector<WorkerDetails>> fitness_workers; std::map<std::tuple<ProcessClass::Fitness, int, bool, int>, vector<WorkerDetails>> fitness_workers;
@ -1238,8 +1237,7 @@ public:
int amount, int amount,
DatabaseConfiguration const& conf, DatabaseConfiguration const& conf,
std::map<Optional<Standalone<StringRef>>, int>& id_used, std::map<Optional<Standalone<StringRef>>, int>& id_used,
std::map<Optional<Standalone<StringRef>>, int> preferredSharing = std::map<Optional<Standalone<StringRef>>, int> preferredSharing = {},
std::map<Optional<Standalone<StringRef>>, int>(),
Optional<WorkerFitnessInfo> minWorker = Optional<WorkerFitnessInfo>(), Optional<WorkerFitnessInfo> minWorker = Optional<WorkerFitnessInfo>(),
bool checkStable = false) { bool checkStable = false) {
std::map<std::tuple<ProcessClass::Fitness, int, bool, int>, vector<WorkerDetails>> fitness_workers; std::map<std::tuple<ProcessClass::Fitness, int, bool, int>, vector<WorkerDetails>> fitness_workers;
@ -1961,15 +1959,10 @@ public:
ProcessClass::ExcludeFit, ProcessClass::ExcludeFit,
db.config, db.config,
id_used, id_used,
std::map<Optional<Standalone<StringRef>>, int>(), {},
true);
getWorkerForRoleInDatacenter(regions[0].dcId,
ProcessClass::Master,
ProcessClass::ExcludeFit,
db.config,
id_used,
std::map<Optional<Standalone<StringRef>>, int>(),
true); true);
getWorkerForRoleInDatacenter(
regions[0].dcId, ProcessClass::Master, ProcessClass::ExcludeFit, db.config, id_used, {}, true);
std::set<Optional<Key>> primaryDC; std::set<Optional<Key>> primaryDC;
primaryDC.insert(regions[0].dcId); primaryDC.insert(regions[0].dcId);
@ -1985,27 +1978,12 @@ public:
getWorkersForSatelliteLogs(db.config, regions[0], regions[1], id_used, satelliteFallback, true); getWorkersForSatelliteLogs(db.config, regions[0], regions[1], id_used, satelliteFallback, true);
} }
getWorkerForRoleInDatacenter(regions[0].dcId, getWorkerForRoleInDatacenter(
ProcessClass::Resolver, regions[0].dcId, ProcessClass::Resolver, ProcessClass::ExcludeFit, db.config, id_used, {}, true);
ProcessClass::ExcludeFit, getWorkerForRoleInDatacenter(
db.config, regions[0].dcId, ProcessClass::CommitProxy, ProcessClass::ExcludeFit, db.config, id_used, {}, true);
id_used, getWorkerForRoleInDatacenter(
std::map<Optional<Standalone<StringRef>>, int>(), regions[0].dcId, ProcessClass::GrvProxy, ProcessClass::ExcludeFit, db.config, id_used, {}, true);
true);
getWorkerForRoleInDatacenter(regions[0].dcId,
ProcessClass::CommitProxy,
ProcessClass::ExcludeFit,
db.config,
id_used,
std::map<Optional<Standalone<StringRef>>, int>(),
true);
getWorkerForRoleInDatacenter(regions[0].dcId,
ProcessClass::GrvProxy,
ProcessClass::ExcludeFit,
db.config,
id_used,
std::map<Optional<Standalone<StringRef>>, int>(),
true);
vector<Optional<Key>> dcPriority; vector<Optional<Key>> dcPriority;
dcPriority.push_back(regions[0].dcId); dcPriority.push_back(regions[0].dcId);
@ -2217,13 +2195,8 @@ public:
std::map<Optional<Standalone<StringRef>>, int> old_id_used; std::map<Optional<Standalone<StringRef>>, int> old_id_used;
id_used[clusterControllerProcessId]++; id_used[clusterControllerProcessId]++;
old_id_used[clusterControllerProcessId]++; old_id_used[clusterControllerProcessId]++;
WorkerFitnessInfo mworker = getWorkerForRoleInDatacenter(clusterControllerDcId, WorkerFitnessInfo mworker = getWorkerForRoleInDatacenter(
ProcessClass::Master, clusterControllerDcId, ProcessClass::Master, ProcessClass::NeverAssign, db.config, id_used, {}, true);
ProcessClass::NeverAssign,
db.config,
id_used,
std::map<Optional<Standalone<StringRef>>, int>(),
true);
auto newMasterFit = mworker.worker.processClass.machineClassFitness(ProcessClass::Master); auto newMasterFit = mworker.worker.processClass.machineClassFitness(ProcessClass::Master);
if (db.config.isExcludedServer(mworker.worker.interf.addresses())) { if (db.config.isExcludedServer(mworker.worker.interf.addresses())) {
newMasterFit = std::max(newMasterFit, ProcessClass::ExcludeFit); newMasterFit = std::max(newMasterFit, ProcessClass::ExcludeFit);
@ -2382,13 +2355,12 @@ public:
RoleFitness oldLogRoutersFit(log_routers, ProcessClass::LogRouter, old_id_used); RoleFitness oldLogRoutersFit(log_routers, ProcessClass::LogRouter, old_id_used);
RoleFitness newLogRoutersFit = oldLogRoutersFit; RoleFitness newLogRoutersFit = oldLogRoutersFit;
if (db.config.usableRegions > 1 && dbi.recoveryState == RecoveryState::FULLY_RECOVERED) { if (db.config.usableRegions > 1 && dbi.recoveryState == RecoveryState::FULLY_RECOVERED) {
newLogRoutersFit = newLogRoutersFit = RoleFitness(getWorkersForRoleInDatacenter(*remoteDC.begin(),
RoleFitness(getWorkersForRoleInDatacenter(*remoteDC.begin(),
ProcessClass::LogRouter, ProcessClass::LogRouter,
newRouterCount, newRouterCount,
db.config, db.config,
id_used, id_used,
std::map<Optional<Standalone<StringRef>>, int>(), {},
Optional<WorkerFitnessInfo>(), Optional<WorkerFitnessInfo>(),
true), true),
ProcessClass::LogRouter, ProcessClass::LogRouter,
@ -2477,7 +2449,7 @@ public:
nBackup, nBackup,
db.config, db.config,
id_used, id_used,
std::map<Optional<Standalone<StringRef>>, int>(), {},
Optional<WorkerFitnessInfo>(), Optional<WorkerFitnessInfo>(),
true), true),
ProcessClass::Backup, ProcessClass::Backup,
@ -2917,7 +2889,7 @@ void checkBetterDDOrRK(ClusterControllerData* self) {
ProcessClass::NeverAssign, ProcessClass::NeverAssign,
self->db.config, self->db.config,
id_used, id_used,
std::map<Optional<Standalone<StringRef>>, int>(), {},
true) true)
.worker; .worker;
if (self->onMasterIsBetter(newRKWorker, ProcessClass::Ratekeeper)) { if (self->onMasterIsBetter(newRKWorker, ProcessClass::Ratekeeper)) {
@ -2933,7 +2905,7 @@ void checkBetterDDOrRK(ClusterControllerData* self) {
ProcessClass::NeverAssign, ProcessClass::NeverAssign,
self->db.config, self->db.config,
id_used, id_used,
std::map<Optional<Standalone<StringRef>>, int>(), {},
true) true)
.worker; .worker;
if (self->onMasterIsBetter(newDDWorker, ProcessClass::DataDistributor)) { if (self->onMasterIsBetter(newDDWorker, ProcessClass::DataDistributor)) {