Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix another deadlock.

This commit is contained in:
Max Neunhoeffer 2013-12-27 09:13:09 +01:00
parent c9b2884def
commit f075ba8ae6
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
arangod/Cluster/ClusterState.cpp
View File

@ -120,17 +120,22 @@ void ClusterState::loadShardInformation () {
} }
std::string ClusterState::getServerEndpoint (ServerID const& serverID) { std::string ClusterState::getServerEndpoint (ServerID const& serverID) {
READ_LOCKER(lock); int tries = 0;
map<ServerID,string>::iterator i = serverAddresses.find(serverID);
if (i != serverAddresses.end()) { while (++tries < 3) {
return i->second; {
READ_LOCKER(lock);
map<ServerID,string>::iterator i = serverAddresses.find(serverID);
if (i != serverAddresses.end()) {
return i->second;
}
}
// must call loadServerInformation outside the lock
loadServerInformation();
} }
loadServerInformation();
i = serverAddresses.find(serverID); return std::string("");
if (i != serverAddresses.end()) {
return i->second;
}
return string("");
} }
ServerID ClusterState::getResponsibleServer (ShardID const& shardID) { ServerID ClusterState::getResponsibleServer (ShardID const& shardID) {