From: Yuri Weinstein <yweinste@redhat.com>
Date: Mon, 7 Oct 2019 19:39:57 +0000 (-0700)
Subject: Merge pull request #29938 from pdvian/wip-41107-nautilus
X-Git-Tag: v14.2.5~211
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2ab8fda3264865b3de9d05e4b8d376f5e7890133;p=ceph.git

Merge pull request #29938 from pdvian/wip-41107-nautilus

nautilus: mds: delay exporting directory whose pin value exceeds max rank id

Reviewed-by: Venky Shankar <vshankar@redhat.com>
---

2ab8fda3264865b3de9d05e4b8d376f5e7890133
diff --cc src/mds/MDCache.h
index 8d898e7f69a,5628033d0cd..9cd83419d9e
--- a/src/mds/MDCache.h
+++ b/src/mds/MDCache.h
@@@ -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 {