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

fix: excluded servers are worst fit for master rather than never assign (so that we can recover if every process has been excluded) 

fix: better master exists did not use exclusions because the configuration was reset
This commit is contained in:
Evan Tschannen 2017-09-20 11:48:26 -07:00
parent 058300be16
commit 0dde15f1d2
1 changed files with 4 additions and 2 deletions

6
fdbserver/ClusterController.actor.cpp
View File

@ -194,7 +194,10 @@ public:
int numEquivalent = 1;
for( auto& it : id_worker ) {
auto fit = it.second.processClass.machineClassFitness( ProcessClass::Master );
if( workerAvailable(it.second, checkStable) && !conf.isExcludedServer(it.second.interf.address()) && fit != ProcessClass::NeverAssign ) {
if(conf.isExcludedServer(it.second.interf.address())) {
fit = std::max(fit, ProcessClass::WorstFit);
}
if( workerAvailable(it.second, checkStable) && fit != ProcessClass::NeverAssign ) {
if( fit < bestFit ) {
bestInfo = std::make_pair(it.second.interf, it.second.processClass);
bestFit = fit;
@ -803,7 +806,6 @@ ACTOR Future<Void> clusterWatchDatabase( ClusterControllerData* cluster, Cluster
iMaster = newMaster.get();
db->masterRegistrationCount = 0;
db->config = DatabaseConfiguration();
db->forceMasterFailure = Promise<Void>();
auto dbInfo = ServerDBInfo( LiteralStringRef("DB") );