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

AddTeamsBestOf:Calculate minTeamNumPerServer before use it

This commit is contained in:
Meng Xu 2019-07-09 14:28:39 -07:00
parent 522230f050
commit aa459a2b03
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdbserver/DataDistribution.actor.cpp
View File

@ -1741,7 +1741,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
int addTeamsBestOf(int teamsToBuild, int desiredTeamNumber, int maxTeamNumber, int remainingTeamBudget) { int addTeamsBestOf(int teamsToBuild, int desiredTeamNumber, int maxTeamNumber, int remainingTeamBudget) {
ASSERT(teamsToBuild >= 0); ASSERT(teamsToBuild >= 0);
ASSERT_WE_THINK(machine_info.size() > 0 || server_info.size() == 0); ASSERT_WE_THINK(machine_info.size() > 0 || server_info.size() == 0);
ASSERT(SERVER_KNOBS->DESIRED_TEAMS_PER_SERVER >= 1 && configuration.storageTeamSize >= 1); ASSERT_WE_THINK(SERVER_KNOBS->DESIRED_TEAMS_PER_SERVER >= 1 && configuration.storageTeamSize >= 1);
// We build more teams than we finally want so that we can use serverTeamRemover() actor to remove the teams // We build more teams than we finally want so that we can use serverTeamRemover() actor to remove the teams
// whose member belong to too many teams. This allows us to get a more balanced number of teams per server. // whose member belong to too many teams. This allows us to get a more balanced number of teams per server.
// The numTeamsPerServerFactor is calculated as // The numTeamsPerServerFactor is calculated as
@ -1780,7 +1780,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
addedMachineTeams = addBestMachineTeams(machineTeamsToBuild, remainingMachineTeamBudget); addedMachineTeams = addBestMachineTeams(machineTeamsToBuild, remainingMachineTeamBudget);
} }
int minTeamNumPerServer = std::numeric_limits<int>::max(); int minTeamNumPerServer = getMinTeamNumPerServer();
while (addedTeams < teamsToBuild || addedTeams < remainingTeamBudget || while (addedTeams < teamsToBuild || addedTeams < remainingTeamBudget ||
minTeamNumPerServer < targetTeamNumPerServer) { minTeamNumPerServer < targetTeamNumPerServer) {
// Step 1: Create 1 best machine team // Step 1: Create 1 best machine team
@ -1866,7 +1866,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
} }
// Keep building teams until each team has no less than targetTeamNumPerServer teams // Keep building teams until each team has no less than targetTeamNumPerServer teams
if (!(addedTeams < teamsToBuild || addedTeams < remainingTeamBudget)) { if (!(addedTeams < teamsToBuild || addedTeams < remainingTeamBudget)) {
// update the minTeamNumPerServer // Update the minTeamNumPerServer
minTeamNumPerServer = getMinTeamNumPerServer(); minTeamNumPerServer = getMinTeamNumPerServer();
} }