apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-06-02 19:25:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

added exclusion logic to account for entire machines when no port is specified

Browse Source
This commit is contained in:
Jon Fu 2019-08-09 10:29:55 -07:00
parent 5a877d6b14
commit ddfcbae929
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fdbserver/DataDistribution.actor.cpp
View File

@ -3322,7 +3322,7 @@ ACTOR Future<Void> storageServerTracker(
.detail("Excluded", self->excludedServers.get( addr ) ? addr.toString() : ipaddr.toString());
status.isUndesired = true;
status.isWrongConfiguration = true;
if (self->failedServers.find(addr) != self->failedServers.end()) {
if (self->failedServers.find(addr) != self->failedServers.end() || self->failedServers.find(ipaddr) != self->failedServers.end()) {
TraceEvent("FailedServerRemoveKeys")
.detail("Address", addr.toString())
.detail("ServerID", server->id);
@ -4292,8 +4292,11 @@ ACTOR Future<Void> ddExclusionSafetyCheck(DistributorExclusionSafetyCheckRequest
vector<UID> excludeServerIDs;
// Go through storage server interfaces and translate Address -> server ID (UID)
for (auto ssi : ssis) {
if (std::find(req.exclusions.begin(), req.exclusions.end(), AddressExclusion(ssi.address().ip, ssi.address().port)) != req.exclusions.end()) {
excludeServerIDs.push_back(ssi.id());
for (AddressExclusion excl : req.exclusions) {
if (excl.excludes(ssi.address())) {
excludeServerIDs.push_back(ssi.id());
break;
}
}
}
std::sort(excludeServerIDs.begin(), excludeServerIDs.end());