]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #34515 from shyukri/wip-43087-nautilus
authorYuri Weinstein <yweinste@redhat.com>
Fri, 15 May 2020 23:13:56 +0000 (16:13 -0700)
committerGitHub <noreply@github.com>
Fri, 15 May 2020 23:13:56 +0000 (16:13 -0700)
nautilus: bluestore: prevent BlueFS::dirty_files from being leaked when syncing metadata

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
1  2 
src/os/bluestore/BlueFS.cc

index 052518b1bc5d852a3a8453299763fc0be6dffafd,76e737fc698c077d5410cb803789fb89c07a87c5..33fc1180d0932b3969ed91b23844169e177462e3
@@@ -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;