From a0609ee3cea8a6667e274201dd3a3ffe5aa0fcb0 Mon Sep 17 00:00:00 2001
From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 15 Oct 2019 18:19:15 -0400
Subject: [PATCH] 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
---
 src/common/ceph_context.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc
index 87194f7dd5370..cb77bb64ea63c 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);
-- 
2.39.5