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

getting rid of locks in cluster comm

This commit is contained in:
Kaveh Vahedipour 2016-06-22 16:42:43 +02:00
parent 39e3923094
commit 11a36db83c
1 changed files with 64 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
arangod/Cluster/ClusterInfo.cpp
View File

@ -1220,16 +1220,8 @@ int ClusterInfo::setCollectionPropertiesCoordinator(
AgencyComm ac; AgencyComm ac;
AgencyCommResult res; AgencyCommResult res;
{ AgencyPrecondition databaseExists(
AgencyCommLocker locker("Plan", "WRITE"); "Plan/Databases/" + databaseName, AgencyPrecondition::EMPTY, false);
if (!locker.successful()) {
return TRI_ERROR_CLUSTER_COULD_NOT_LOCK_PLAN;
}
if (!ac.exists("Plan/Databases/" + databaseName)) {
return TRI_ERROR_ARANGO_DATABASE_NOT_FOUND;
}
res = ac.getValues("Plan/Collections/" + databaseName+"/" + collectionID); res = ac.getValues("Plan/Collections/" + databaseName+"/" + collectionID);
@ -1267,13 +1259,20 @@ int ClusterInfo::setCollectionPropertiesCoordinator(
} }
res.clear(); res.clear();
res = ac.setValue("Plan/Collections/" + databaseName + "/" + collectionID,
copy.slice(), 0.0); AgencyOperation setColl (
} "Plan/Collections/" + databaseName + "/" + collectionID,
AgencyValueOperationType::SET, copy.slice());
AgencyWriteTransaction trans (setColl, databaseExists);
res = ac.sendTransactionWithFailover(trans);
if (res.successful()) { if (res.successful()) {
loadPlan(); loadPlan();
return TRI_ERROR_NO_ERROR; return TRI_ERROR_NO_ERROR;
} else {
return TRI_ERROR_ARANGO_DATABASE_NOT_FOUND;
} }
return TRI_ERROR_INTERNAL; return TRI_ERROR_INTERNAL;
@ -1290,16 +1289,8 @@ int ClusterInfo::setCollectionStatusCoordinator(
AgencyComm ac; AgencyComm ac;
AgencyCommResult res; AgencyCommResult res;
{ AgencyPrecondition databaseExists(
AgencyCommLocker locker("Plan", "WRITE"); "Plan/Databases/" + databaseName, AgencyPrecondition::EMPTY, false);
if (!locker.successful()) {
return TRI_ERROR_CLUSTER_COULD_NOT_LOCK_PLAN;
}
if (!ac.exists("Plan/Databases/" + databaseName)) {
return TRI_ERROR_ARANGO_DATABASE_NOT_FOUND;
}
res = ac.getValues("Plan/Collections/" + databaseName +"/" + collectionID); res = ac.getValues("Plan/Collections/" + databaseName +"/" + collectionID);
@ -1338,13 +1329,20 @@ int ClusterInfo::setCollectionStatusCoordinator(
return TRI_ERROR_OUT_OF_MEMORY; return TRI_ERROR_OUT_OF_MEMORY;
} }
res.clear(); res.clear();
res = ac.setValue("Plan/Collections/" + databaseName + "/" + collectionID,
builder.slice(), 0.0); AgencyOperation setColl (
} "Plan/Collections/" + databaseName + "/" + collectionID,
AgencyValueOperationType::SET, builder.slice());
AgencyWriteTransaction trans (setColl, databaseExists);
res = ac.sendTransactionWithFailover(trans);
if (res.successful()) { if (res.successful()) {
loadPlan(); loadPlan();
return TRI_ERROR_NO_ERROR; return TRI_ERROR_NO_ERROR;
} else {
return TRI_ERROR_ARANGO_DATABASE_NOT_FOUND;
} }
return TRI_ERROR_INTERNAL; return TRI_ERROR_INTERNAL;
@ -1880,14 +1878,7 @@ void ClusterInfo::loadServers() {
} }
// Now contact the agency: // Now contact the agency:
AgencyCommResult result; AgencyCommResult result = _agency.getValues(prefixServers);
{
AgencyCommLocker locker("Current", "READ");
if (locker.successful()) {
result = _agency.getValues(prefixServers);
}
}
if (result.successful()) { if (result.successful()) {
@ -2012,14 +2003,7 @@ void ClusterInfo::loadCurrentCoordinators() {
} }
// Now contact the agency: // Now contact the agency:
AgencyCommResult result; AgencyCommResult result = _agency.getValues(prefixCurrentCoordinators);
{
AgencyCommLocker locker("Current", "READ");
if (locker.successful()) {
result = _agency.getValues(prefixCurrentCoordinators);
}
}
if (result.successful()) { if (result.successful()) {
@ -2069,14 +2053,7 @@ void ClusterInfo::loadCurrentDBServers() {
} }
// Now contact the agency: // Now contact the agency:
AgencyCommResult result; AgencyCommResult result = _agency.getValues(prefixCurrentDBServers);
{
AgencyCommLocker locker("Current", "READ");
if (locker.successful()) {
result = _agency.getValues(prefixCurrentDBServers);
}
}
if (result.successful()) { if (result.successful()) {