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

port change from devel by @danielhlarkin (#9773)

This commit is contained in:
Jan 2019-08-21 12:07:43 +02:00 committed by KVS85
parent bd5df4d49e
commit 70c31da560
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arangod/Pregel/Conductor.cpp
View File

@ -398,13 +398,8 @@ void Conductor::cancel() {
void Conductor::cancelNoLock() {
_callbackMutex.assertLockedByCurrentThread();
_state = ExecutionState::CANCELED;
bool ok;
int res;
std::tie(ok, res) = basics::function_utils::retryUntilTimeout<int>(
[this]() -> std::pair<bool, int> {
int res = _finalizeWorkers();
return std::make_pair(res != TRI_ERROR_QUEUE_FULL, res);
},
bool ok = basics::function_utils::retryUntilTimeout(
[this]() -> bool { return (_finalizeWorkers() != TRI_ERROR_QUEUE_FULL); },
Logger::PREGEL, "cancel worker execution");
if (!ok) {
LOG_TOPIC("f8b3c", ERR, Logger::PREGEL)