Fix shutdown deadlock regarding comm tasks (arangodb#9204)

goedderz · mchacki · commit b632d58c8061 · 2019-06-07T13:23:33.000+02:00
* Wait for _commTasks in unprepare, that is after Cluster::stop * Chose better method names * Revert "Chose better method names" This reverts commit 91e8213. * Revert "Wait for _commTasks in unprepare, that is after Cluster::stop" This reverts commit 6551ae9. * Next try, stop ClusterComm threads earlier
diff --git a/arangod/Cluster/ClusterComm.cpp b/arangod/Cluster/ClusterComm.cpp
@@ -1150,7 +1150,7 @@ void ClusterCommThread::run() {
   TRI_ASSERT(_communicator != nullptr);
   LOG_TOPIC("74eda", DEBUG, Logger::CLUSTER) << "starting ClusterComm thread";
   auto lastAbortCheck = std::chrono::steady_clock::now();
-  while (!isStopping()) {
+  while (!application_features::ApplicationServer::isStopping()) {
     try {
       if (std::chrono::steady_clock::now() - lastAbortCheck >
           std::chrono::duration<double>(3.0)) {
