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

Resolve comments

This commit is contained in:
Young Liu 2020-08-26 14:41:41 -07:00
parent 9564171463
commit e8e24a8ed6
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fdbclient/NativeAPI.actor.cpp
View File

@ -1540,13 +1540,18 @@ void DatabaseContext::updateProxies() {
proxiesLastChange = clientInfo->get().id; proxiesLastChange = clientInfo->get().id;
masterProxies.clear(); masterProxies.clear();
grvProxies.clear(); grvProxies.clear();
bool masterProxyProvisional = false, grvProxyProvisional = false;
if (clientInfo->get().masterProxies.size()) { if (clientInfo->get().masterProxies.size()) {
masterProxies = Reference<ProxyInfo>(new ProxyInfo(clientInfo->get().masterProxies)); masterProxies = Reference<ProxyInfo>(new ProxyInfo(clientInfo->get().masterProxies));
proxyProvisional = clientInfo->get().masterProxies[0].provisional; masterProxyProvisional = clientInfo->get().masterProxies[0].provisional;
} }
if (clientInfo->get().grvProxies.size()) { if (clientInfo->get().grvProxies.size()) {
grvProxies = Reference<GrvProxyInfo>(new GrvProxyInfo(clientInfo->get().grvProxies)); grvProxies = Reference<GrvProxyInfo>(new GrvProxyInfo(clientInfo->get().grvProxies));
proxyProvisional = clientInfo->get().grvProxies[0].provisional; grvProxyProvisional = clientInfo->get().grvProxies[0].provisional;
}
if (clientInfo->get().masterProxies.size() && clientInfo->get().grvProxies.size()) {
ASSERT(masterProxyProvisional == grvProxyProvisional);
proxyProvisional = masterProxyProvisional;
} }
} }

2
fdbrpc/Locality.cpp
View File

@ -72,7 +72,7 @@ ProcessClass::Fitness ProcessClass::machineClassFitness( ClusterRole role ) cons
case ProcessClass::UnsetClass: case ProcessClass::UnsetClass:
return ProcessClass::UnsetFit; return ProcessClass::UnsetFit;
case ProcessClass::GrvProxyClass: case ProcessClass::GrvProxyClass:
return ProcessClass::GoodFit; return ProcessClass::OkayFit;
case ProcessClass::ResolutionClass: case ProcessClass::ResolutionClass:
return ProcessClass::OkayFit; return ProcessClass::OkayFit;
case ProcessClass::TransactionClass: case ProcessClass::TransactionClass: