From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 15 Oct 2019 22:19:15 +0000 (-0400)
Subject: common/ceph_context: avoid unnecessary wait during service thread shutdown
X-Git-Tag: v14.2.5~69^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c913fb2a48e2433eeb8e6f118fd0be0dbc080eb7;p=ceph.git

common/ceph_context: avoid unnecessary wait during service thread shutdown

Fixes: https://tracker.ceph.com/issues/42332
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit e8249d3b28f8789b2d4aca6fb75c75103a5cbea1)
---

diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc
index 3d70344d212..d454593686f 100644
--- a/src/common/ceph_context.cc
+++ b/src/common/ceph_context.cc
@@ -196,6 +196,9 @@ public:
   {
     while (1) {
       std::unique_lock l(_lock);
+      if (_exit_thread) {
+        break;
+      }
 
       if (_cct->_conf->heartbeat_interval) {
         auto interval = ceph::make_timespan(_cct->_conf->heartbeat_interval);