diff mbox

[3/5] mds: alllow handle_client_readdir() fetching freezing dir.

Message ID 1354243014-21072-4-git-send-email-zheng.z.yan@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Yan, Zheng Nov. 30, 2012, 2:36 a.m. UTC 
From: "Yan, Zheng" <zheng.z.yan@intel.com>

At that point, the request already auth pins some objects.
So CDir::fetch() should ignore can_auth_pin check.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
---
 src/mds/Server.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 59d7d3c..2c59f25 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -2741,9 +2741,14 @@  void Server::handle_client_readdir(MDRequest *mdr)
   assert(dir->is_auth());
 
   if (!dir->is_complete()) {
+    if (dir->is_frozen()) {
+      dout(7) << "dir is frozen " << *dir << dendl;
+      dir->add_waiter(CDir::WAIT_UNFREEZE, new C_MDS_RetryRequest(mdcache, mdr));
+      return;
+    }
     // fetch
     dout(10) << " incomplete dir contents for readdir on " << *dir << ", fetching" << dendl;
-    dir->fetch(new C_MDS_RetryRequest(mdcache, mdr));
+    dir->fetch(new C_MDS_RetryRequest(mdcache, mdr), true);
     return;
   }