Merge pull request #30947 from dillaman/wip-42332

common/ceph_context: avoid unnecessary wait during service thread shutdown Reviewed-by: Kefu Chai <kchai@redhat.com>
ceph · Oct 21, 2019 · 4c2f207 · 4c2f207
2 parents 3ae93a7 + e8249d3
commit 4c2f207
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc
@@ -197,6 +197,9 @@ class CephContextServiceThread : public Thread
   {
     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);