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

Merge pull request #770 from bnamasivayam/release-6.0 

When the cluster is configured from fearless setup to usable_regions=…
This commit is contained in:
Evan Tschannen 2018-09-13 10:36:17 -07:00 committed by GitHub
parent 0c82edc5d9 d622cb1f6e
commit 16018ee36d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
fdbserver/DataDistribution.actor.cpp
View File

@ -1373,18 +1373,8 @@ ACTOR Future<Void> teamTracker( DDTeamCollection *self, Reference<TCTeamInfo> te
state bool lastHealthy = team->isHealthy();
state bool lastOptimal = team->isOptimal() && lastHealthy;
state bool lastWrongConfiguration = team->isWrongConfiguration();
if(lastHealthy) {
self->healthyTeamCount++;
self->zeroHealthyTeams->set(false);
}
if(lastOptimal) {
self->optimalTeamCount++;
self->zeroOptimalTeams.set(false);
}
state bool lastZeroHealthy = self->zeroHealthyTeams->get();
state bool firstCheck = true;
Void _ = wait( yield() );
TraceEvent("TeamTrackerStarting", self->masterId).detail("Reason", "Initial wait complete (sc)").detail("Team", team->getDesc());
@ -1420,10 +1410,23 @@ ACTOR Future<Void> teamTracker( DDTeamCollection *self, Reference<TCTeamInfo> te
change.push_back( self->zeroHealthyTeams->onChange() );
bool healthy = self->satisfiesPolicy(team->servers) && !anyUndesired && team->getServerIDs().size() == self->configuration.storageTeamSize && serversLeft == self->configuration.storageTeamSize;
bool optimal = team->isOptimal() && healthy;
bool recheck = !healthy && (lastReady != self->initialFailureReactionDelay.isReady() || (lastZeroHealthy && !self->zeroHealthyTeams->get()));
lastReady = self->initialFailureReactionDelay.isReady();
lastZeroHealthy = self->zeroHealthyTeams->get();
if (firstCheck) {
if (healthy) {
self->healthyTeamCount++;
self->zeroHealthyTeams->set(false);
}
if (optimal) {
self->optimalTeamCount++;
self->zeroOptimalTeams.set(false);
}
}
if( serversLeft != lastServersLeft || anyUndesired != lastAnyUndesired || anyWrongConfiguration != lastWrongConfiguration || wrongSize || recheck ) {
TraceEvent("TeamHealthChanged", self->masterId)
.detail("Team", team->getDesc()).detail("ServersLeft", serversLeft)
@ -1433,17 +1436,15 @@ ACTOR Future<Void> teamTracker( DDTeamCollection *self, Reference<TCTeamInfo> te
team->setHealthy( healthy ); // Unhealthy teams won't be chosen by bestTeam
team->setWrongConfiguration( anyWrongConfiguration );
bool optimal = team->isOptimal() && healthy;
if( optimal != lastOptimal ) {
lastOptimal = optimal;
if( !firstCheck && optimal != lastOptimal ) {
self->optimalTeamCount += optimal ? 1 : -1;
ASSERT( self->optimalTeamCount >= 0 );
self->zeroOptimalTeams.set(self->optimalTeamCount == 0);
}
lastOptimal = optimal;
if( lastHealthy != healthy ) {
lastHealthy = healthy;
if( !firstCheck && lastHealthy != healthy ) {
self->healthyTeamCount += healthy ? 1 : -1;
ASSERT( self->healthyTeamCount >= 0 );
@ -1459,6 +1460,7 @@ ACTOR Future<Void> teamTracker( DDTeamCollection *self, Reference<TCTeamInfo> te
.detail("Optimal", optimal)
.detail("OptimalTeamCount", self->optimalTeamCount);
}
lastHealthy = healthy;
lastServersLeft = serversLeft;
lastAnyUndesired = anyUndesired;
@ -1543,6 +1545,7 @@ ACTOR Future<Void> teamTracker( DDTeamCollection *self, Reference<TCTeamInfo> te
}
}
firstCheck = false;
// Wait for any of the machines to change status
Void _ = wait( quorum( change, 1 ) );
Void _ = wait( yield() );