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

fix: getLocalityForDcId was returning counts rather than actual localities

This commit is contained in:
Evan Tschannen 2019-02-22 14:02:34 -08:00
parent 0e19b5a935
commit d600b0a51c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fdbserver/LogSystemConfig.h
View File

@ -195,8 +195,8 @@ struct LogSystemConfig {
std::map<int8_t, int> allLocalities;
for( auto& tLogSet : tLogs ) {
for( auto& tLog : tLogSet.tLogs ) {
if( tLog.present() && tLogSet.locality >= 0 ) {
if( tLog.interf().locality.dcId() == dcId ) {
if( tLogSet.locality >= 0 ) {
if( tLog.present() && tLog.interf().locality.dcId() == dcId ) {
matchingLocalities[tLogSet.locality]++;
} else {
allLocalities[tLogSet.locality]++;
@ -208,8 +208,8 @@ struct LogSystemConfig {
for(auto& oldLog : oldTLogs) {
for( auto& tLogSet : oldLog.tLogs ) {
for( auto& tLog : tLogSet.tLogs ) {
if( tLog.present() && tLogSet.locality >= 0 ) {
if( tLog.interf().locality.dcId() == dcId ) {
if( tLogSet.locality >= 0 ) {
if( tLog.present() && tLog.interf().locality.dcId() == dcId ) {
matchingLocalities[tLogSet.locality]++;
} else {
allLocalities[tLogSet.locality]++;
@ -249,7 +249,7 @@ struct LogSystemConfig {
if(bestLoc != tagLocalityInvalid) {
return std::make_pair(bestLoc, secondLoc);
}
return std::make_pair(secondLocalityCount, thirdLocalityCount);
return std::make_pair(secondLoc, thirdLoc);
}
std::vector<std::pair<UID, NetworkAddress>> allSharedLogs() const {