From b632d58c8061b6f66fa8ba9cb0f53fa5baf08826 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20G=C3=B6dderz?= <tobias@arangodb.com>
Date: Fri, 7 Jun 2019 13:23:33 +0200
Subject: [PATCH] Fix shutdown deadlock regarding comm tasks (#9204)

* Wait for _commTasks in unprepare, that is after Cluster::stop

* Chose better method names

* Revert "Chose better method names"

This reverts commit 91e821348740c655f47207af7e570075f2241895.

* Revert "Wait for _commTasks in unprepare, that is after Cluster::stop"

This reverts commit 6551ae90d74fc046369fdb97cc5872706ce1a184.

* Next try, stop ClusterComm threads earlier
---
 arangod/Cluster/ClusterComm.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arangod/Cluster/ClusterComm.cpp b/arangod/Cluster/ClusterComm.cpp
index b09f70d8e7..4d1610b937 100644
--- 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)) {