From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 15 May 2020 23:13:56 +0000 (-0700)
Subject: Merge pull request #34515 from shyukri/wip-43087-nautilus
X-Git-Tag: v14.2.10~68
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cd7d34ca008d40cceee3f9b0071e67f06e47ef65;p=ceph.git

Merge pull request #34515 from shyukri/wip-43087-nautilus

nautilus: bluestore: prevent BlueFS::dirty_files from being leaked when syncing metadata

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
---

cd7d34ca008d40cceee3f9b0071e67f06e47ef65
diff --cc src/os/bluestore/BlueFS.cc
index 052518b1bc5d,76e737fc698c..33fc1180d093
--- a/src/os/bluestore/BlueFS.cc
+++ b/src/os/bluestore/BlueFS.cc
@@@ -2816,10 -2745,10 +2816,10 @@@ int BlueFS::_preallocate(FileRef f, uin
    return 0;
  }
  
 -void BlueFS::sync_metadata()
 +void BlueFS::sync_metadata(bool avoid_compact)
  {
    std::unique_lock l(lock);
-   if (log_t.empty()) {
+   if (log_t.empty() && dirty_files.empty()) {
      dout(10) << __func__ << " - no pending log events" << dendl;
    } else {
      dout(10) << __func__ << dendl;