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

fixed r/w deadlock

This commit is contained in:
Jan Steemann 2013-12-20 16:27:54 +01:00
parent c460ab97e9
commit 5a3b49a7bc
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
arangod/Cluster/ClusterState.cpp
View File

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