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: v12.2.13~83^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a0609ee3cea8a6667e274201dd3a3ffe5aa0fcb0;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)

Conflicts:
	src/common/ceph_context.cc
- luminous uses Mutex::Locker instead of std::unique_lock
---

diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc
index 87194f7dd53..cb77bb64ea6 100644
--- a/src/common/ceph_context.cc
+++ b/src/common/ceph_context.cc
@@ -135,6 +135,9 @@ public:
   {
     while (1) {
       Mutex::Locker l(_lock);
+      if (_exit_thread) {
+        break;
+      }
 
       if (_cct->_conf->heartbeat_interval) {
         utime_t interval(_cct->_conf->heartbeat_interval, 0);