]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
kv/RocksDBStore: break out of compaction thread early on shutdown 32619/head
authorSage Weil <sage@redhat.com>
Mon, 13 Jan 2020 14:51:48 +0000 (08:51 -0600)
committerSage Weil <sage@redhat.com>
Tue, 14 Jan 2020 14:47:36 +0000 (08:47 -0600)
Fixes: https://tracker.ceph.com/issues/43587
Signed-off-by: Sage Weil <sage@redhat.com>
src/kv/RocksDBStore.cc

index 841e4f322c772c9e13efe48e67c43986cd900b1e..4ef17d7d2268500ce53194a6eeb368405a8330f6 100644 (file)
@@ -1226,7 +1226,7 @@ void RocksDBStore::compact_thread_entry()
   std::unique_lock l{compact_queue_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());