From cc6a0e9bcdae581fae748b3129c22dbd5ab3d014 Mon Sep 17 00:00:00 2001
From: Meng Xu <meng_xu@apple.com>
Date: Wed, 26 Jun 2019 19:33:38 -0700
Subject: [PATCH] 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.
---
fdbserver/DataDistribution.actor.cpp | 2 +-
fdbserver/QuietDatabase.actor.cpp | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/fdbserver/DataDistribution.actor.cpp b/fdbserver/DataDistribution.actor.cpp
index 721dcd11df..443c47fc7b 100644
--- a/fdbserver/DataDistribution.actor.cpp
+++ b/fdbserver/DataDistribution.actor.cpp
@@ -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 ) {
diff --git a/fdbserver/QuietDatabase.actor.cpp b/fdbserver/QuietDatabase.actor.cpp
index 9edb9d06e3..7350420775 100644
--- a/fdbserver/QuietDatabase.actor.cpp
+++ b/fdbserver/QuietDatabase.actor.cpp
@@ -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)