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

Show timeout when failing

This commit is contained in:
Andreas Streichardt 2017-05-11 18:05:22 +02:00
parent e11ef2bf54
commit b96c58a108
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arangod/Cluster/ClusterInfo.cpp
View File

@ -1413,7 +1413,7 @@ int ClusterInfo::dropCollectionCoordinator(
if (TRI_microtime() > endTime) {
LOG_TOPIC(ERR, Logger::CLUSTER)
<< "Timeout in _drop collection"
<< "Timeout in _drop collection (" << realTimeout << ")"
<< ": database: " << databaseName << ", collId:" << collectionID
<< "\ntransaction sent to agency: " << trans.toJson();
AgencyCommResult ag = ac.getValues("");
@ -2652,6 +2652,17 @@ void ClusterInfo::invalidatePlan() {
}
}
//////////////////////////////////////////////////////////////////////////////
/// @brief invalidate current coordinators
//////////////////////////////////////////////////////////////////////////////
void ClusterInfo::invalidateCurrentCoordinators() {
{
WRITE_LOCKER(writeLocker, _coordinatorsProt.lock);
_coordinatorsProt.isValid = false;
}
}
//////////////////////////////////////////////////////////////////////////////
/// @brief invalidate current
//////////////////////////////////////////////////////////////////////////////
@ -2665,14 +2676,11 @@ void ClusterInfo::invalidateCurrent() {
WRITE_LOCKER(writeLocker, _DBServersProt.lock);
_DBServersProt.isValid = false;
}
{
WRITE_LOCKER(writeLocker, _coordinatorsProt.lock);
_coordinatorsProt.isValid = false;
}
{
WRITE_LOCKER(writeLocker, _currentProt.lock);
_currentProt.isValid = false;
}
invalidateCurrentCoordinators();
}
//////////////////////////////////////////////////////////////////////////////