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

TeamCollection: Improve code efficiency 

Improve code efficiency with the following changes:
1) Change always-true if-statement to ASSERT;
2) Return when we are confident we will not find more machine teams.

No functionality change.

Signed-off-by: Meng Xu <meng_xu@apple.com>
This commit is contained in:
Meng Xu 2018-12-01 17:10:47 -08:00
parent 8d6c6e000b
commit 54a4d6b308
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fdbserver/DataDistribution.actor.cpp
View File

@ -1424,8 +1424,10 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
ASSERT(!tcMachineInfo->serversOnMachine.empty());
LocalityEntry process = tcMachineInfo->localityEntry;
forcedAttributes.push_back(process);
} else {
// when leastUsedMachine is empty, we will never find a team later, so we can simply return.
return addedMachineTeams;
}
// TODO: If leastUsedServers is empty, you can simply return because you will never succeed.
// Step 4: Reuse Policy's selectReplicas() to create team for the representative process.
std::vector<UID*> bestTeam;
@ -1662,15 +1664,12 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
int healthyMachineTeamCount = 0;
int totalMachineTeamCount = 0;
for (auto mt= machineTeams.begin(); mt != machineTeams.end(); ++mt) {
if ((*mt)->machines.size() == configuration.storageTeamSize) { // TODO: Remove this if if SevError never happens
if (isMachineTeamHealthy(*mt)) {
++healthyMachineTeamCount;
}
++totalMachineTeamCount;
} else {
TraceEvent(SevError, "MachineTeamHasIncorrectSize")
.detail("Observation", "WeMustCheckMachineTeamSize");
ASSERT ((*mt)->machines.size() == configuration.storageTeamSize);
if (isMachineTeamHealthy(*mt)) {
++healthyMachineTeamCount;
}
++totalMachineTeamCount;
}
int totalHealthyMachineCount = 0;