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

TeamCollectionInfo: Resolve review comments

This commit is contained in:
Meng Xu 2019-06-28 15:59:47 -07:00
parent cb681693df
commit 0baae134f6
3 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
documentation/sphinx/source/release-notes.rst
View File

@ -2,6 +2,14 @@
Release Notes
#############
6.1.11
======
Fixes
-----
* Ensure new added machines are used to build teams and host data from existing machines when a cluster is expanded. `(PR #1764) <https://github.com/apple/foundationdb/pull/1764>`_
6.1.10
======

38
fdbserver/DataDistribution.actor.cpp
View File

@ -1343,12 +1343,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
// Invariant: We only create correct size machine teams.
// When configuration (e.g., team size) is changed, the DDTeamCollection will be destroyed and rebuilt
// so that the invariant will not be violated.
int teamCount = 0;
for (auto& mt : machine.second->machineTeams) {
if (isMachineTeamHealthy(mt)) {
++teamCount;
}
}
int teamCount = machine.second->machineTeams.size();
if (teamCount < minTeamCount) {
leastUsedMachines.clear();
@ -1385,7 +1380,8 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
// that have the least-utilized server
team.clear();
auto success = machineLocalityMap.selectReplicas(configuration.storagePolicy, forcedAttributes, team);
// NOTE: selectReplicas() returns false always when storageTeamSize == 1
// NOTE: selectReplicas() should always return success when storageTeamSize = 1
ASSERT_WE_THINK ( configuration.storageTeamSize > 1 || (configuration.storageTeamSize == 1 && success) );
if (!success && configuration.storageTeamSize > 1) {
break;
}
@ -1605,9 +1601,9 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
uint32_t minTeamNumber = std::numeric_limits<uint32_t>::max();
uint32_t maxTeamNumber = std::numeric_limits<uint32_t>::min();
for (auto& server : server_info) {
// if ( server_status.get(server.first).isUnhealthy() ) {
// continue;
// }
if ( server_status.get(server.first).isUnhealthy() ) {
continue;
}
if (server.second->teams.size() < minTeamNumber) {
minTeamNumber = server.second->teams.size();
}
@ -1622,9 +1618,9 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
int minTeamNumber = std::numeric_limits<int>::max();
int maxTeamNumber = 0;
for (auto& machine : machine_info) {
// if ( !isMachineHealthy(machine.second) ) {
// continue;
// }
if ( !isMachineHealthy(machine.second) ) {
continue;
}
if (machine.second->machineTeams.size() < minTeamNumber) {
minTeamNumber = machine.second->machineTeams.size();
}
@ -1691,12 +1687,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
int getRemainingMachineTeamBudget() {
int remainingMachineTeamBudget = 0;
for (auto& m : machine_info) {
int healthyMTCount = 0;
for (auto& mt : m.second->machineTeams) {
if (isMachineTeamHealthy(mt)) {
++healthyMTCount;
}
}
int healthyMTCount = m.second->machineTeams.size();
remainingMachineTeamBudget += std::max(0, (int)(SERVER_KNOBS->DESIRED_TEAMS_PER_SERVER - healthyMTCount));
}
@ -1712,12 +1703,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
// SERVER_KNOBS->DESIRED_TEAMS_PER_SERVER teams
int remainingTeamBudget = 0;
for (auto& s : server_info) {
int numValidTeams = 0;
for (auto& team : s.second->teams) {
if (!team->isWrongConfiguration() && team->isHealthy()) {
++numValidTeams;
}
}
int numValidTeams = s.second->teams.size();
remainingTeamBudget += std::max(0, (int)(SERVER_KNOBS->DESIRED_TEAMS_PER_SERVER - numValidTeams));
}
@ -1757,7 +1743,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
.detail("MachineTeamsToBuild", machineTeamsToBuild)
.detail("RemainingMachineTeamBudget", remainingMachineTeamBudget);
// Pre-build all machine teams until we have the desired number of machine teams
if (machineTeamsToBuild > 0) {
if (machineTeamsToBuild > 0 || remainingMachineTeamBudget > 0) {
addedMachineTeams = addBestMachineTeams(machineTeamsToBuild, remainingMachineTeamBudget);
}

4
fdbserver/QuietDatabase.actor.cpp
View File

@ -308,7 +308,9 @@ ACTOR Future<bool> getTeamCollectionValid(Database cx, WorkerInterface dataDistr
// The if condition should be consistent with the condition in teamRemover() that decides
// if redundant teams exist.
if (healthyMachineTeamCount > desiredMachineTeamNumber || minMachineTeamOnMachine <= 0 ) {
if (healthyMachineTeamCount > desiredMachineTeamNumber || (minMachineTeamOnMachine <= 0 && SERVER_KNOBS->DESIRED_TEAMS_PER_SERVER == 3)) {
// When DESIRED_TEAMS_PER_SERVER == 1, we see minMachineTeamOnMachine can be 0 in one out of 30k test cases.
// Only check DESIRED_TEAMS_PER_SERVER == 3 for now since it is mostly used configuration.
TraceEvent("GetTeamCollectionValid")
.detail("CurrentTeamNumber", currentTeamNumber)
.detail("DesiredTeamNumber", desiredTeamNumber)