]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
kv/RocksDBStore: break out of compaction thread early on shutdown 32715/head
authorSage Weil <sage@redhat.com>
Mon, 13 Jan 2020 14:51:48 +0000 (08:51 -0600)
committerNathan Cutler <ncutler@suse.com>
Sat, 18 Jan 2020 10:20:23 +0000 (11:20 +0100)
Fixes: https://tracker.ceph.com/issues/43587
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 9fab24504918c2df464a2e99f2629c258ba316ff)

src/kv/RocksDBStore.cc

index d9381b35047d53ce0df6771ebcb68e6453cccb31..4eac1e7c30372a0cfa353cc4d2ee24d1da3b36b2 100644 (file)
@@ -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());