]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #29938 from pdvian/wip-41107-nautilus
authorYuri Weinstein <yweinste@redhat.com>
Mon, 7 Oct 2019 19:39:57 +0000 (12:39 -0700)
committerGitHub <noreply@github.com>
Mon, 7 Oct 2019 19:39:57 +0000 (12:39 -0700)
nautilus: mds: delay exporting directory whose pin value exceeds max rank id

Reviewed-by: Venky Shankar <vshankar@redhat.com>
1  2 
src/mds/MDCache.cc
src/mds/MDCache.h
src/mds/MDSRank.cc

Simple merge
index 8d898e7f69a4d308942551ed83a25fc90c8885cb,5628033d0cd0b0c57bf53e21e60d37ad71efbd0d..9cd83419d9e3fe5e47182b42ce8502709dad3cc9
@@@ -1319,15 -1321,9 +1322,16 @@@ public
  public:
    /* Because exports may fail, this set lets us keep track of inodes that need exporting. */
    std::set<CInode *> export_pin_queue;
+   std::set<CInode *> export_pin_delayed_queue;
  
    OpenFileTable open_file_table;
 +
 +private:
 +  std::thread upkeeper;
 +  ceph::mutex upkeep_mutex = ceph::make_mutex("MDCache::upkeep_mutex");
 +  ceph::condition_variable upkeep_cvar;
 +  time upkeep_last_trim = time::min();
 +  std::atomic<bool> upkeep_trim_shutdown{false};
  };
  
  class C_MDS_RetryRequest : public MDSInternalContext {
Simple merge