From: chuanhong.wang <chuanhong.wang@163.com>
Date: Mon, 14 Aug 2017 08:49:28 +0000 (+0000)
Subject: Fix a dead lock when running fio: "RDMADispatcher::polling_stop" hold the lock and... 
X-Git-Tag: v13.0.0~101^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=13ed4504d9436661fcbdafcea3c5a640332443cb;p=ceph.git

Fix a dead lock when running fio: "RDMADispatcher::polling_stop" hold the lock and wait
"RDMADispatcher::polling" ending, then RDMADispatcher::polling can't hold the lock and
can't end its work.

Signed-off-by: Wang Chuanhong <chuanhong.wang@163.com>
---

diff --git a/src/msg/async/rdma/RDMAStack.cc b/src/msg/async/rdma/RDMAStack.cc
index dcc6e1a8fb3..7e5c9d3e9bf 100644
--- a/src/msg/async/rdma/RDMAStack.cc
+++ b/src/msg/async/rdma/RDMAStack.cc
@@ -99,8 +99,11 @@ void RDMADispatcher::polling_start()
 
 void RDMADispatcher::polling_stop()
 {
-  Mutex::Locker l(lock);
-  done = true;
+  {
+    Mutex::Locker l(lock);
+    done = true;
+  }
+
   if (!t.joinable())
     return;