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

TeamCollectionTest:Do not enforce minServerTeamOnServer larger than 0 

In ConfigureTest, one server may be left with 0 server teams, even if
we call buildTeams in the storageServerTracker.
This commit is contained in:
Meng Xu 2019-06-26 19:33:38 -07:00
parent c23d89c98a
commit cc6a0e9bcd
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbserver/DataDistribution.actor.cpp
View File

@ -1682,7 +1682,7 @@ struct DDTeamCollection : ReferenceCounted<DDTeamCollection> {
}
// Each machine is expected to have SERVER_KNOBS->DESIRED_TEAMS_PER_SERVER,
// remainingMachineTeamBudget is the number of machine teams needed to ensure every machine has SERVER_KNOBS->DESIRED_TEAMS_PER_SERVER teams
// remainingMachineTeamBudget is the number of machine teams needed to ensure every machine has SERVER_KNOBS->DESIRED_TEAMS_PER_SERVER teams
int getRemainingMachineTeamBudget() {
int remainingMachineTeamBudget = 0;
for ( auto& m : machine_info ) {

1
fdbserver/QuietDatabase.actor.cpp
View File

@ -305,7 +305,6 @@ 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 ||
minServerTeamOnServer <= 0 ||
minMachineTeamOnMachine <= 0 ) {
TraceEvent("GetTeamCollectionValid")
.detail("CurrentTeamNumber", currentTeamNumber)