From: Sage Weil <sage@redhat.com>
Date: Mon, 13 Jan 2020 14:51:48 +0000 (-0600)
Subject: kv/RocksDBStore: break out of compaction thread early on shutdown
X-Git-Tag: v14.2.8~92^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aaedc54eb417ce553802248e6b489c6dc89bcb97;p=ceph.git

kv/RocksDBStore: break out of compaction thread early on shutdown

Fixes: https://tracker.ceph.com/issues/43587
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 9fab24504918c2df464a2e99f2629c258ba316ff)
---

diff --git a/src/kv/RocksDBStore.cc b/src/kv/RocksDBStore.cc
index d9381b35047d..4eac1e7c3037 100644
--- a/src/kv/RocksDBStore.cc
+++ b/src/kv/RocksDBStore.cc
@@ -1295,7 +1295,7 @@ void RocksDBStore::compact_thread_entry()
   compact_queue_lock.Lock();
   dout(10) << __func__ << " enter" << dendl;
   while (!compact_queue_stop) {
-    while (!compact_queue.empty()) {
+    if (!compact_queue.empty()) {
       pair<string,string> range = compact_queue.front();
       compact_queue.pop_front();
       logger->set(l_rocksdb_compact_queue_len, compact_queue.size());