From: Rishabh Dave <ridave@redhat.com>
Date: Thu, 7 Mar 2019 05:00:09 +0000 (+0530)
Subject: mds: check earlier if directories are already exported
X-Git-Tag: v13.2.7~32^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ad5c1cdfe47b35eb50f6de3d942d87392784a6ce;p=ceph.git

mds: check earlier if directories are already exported

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 46fb90734f371b5467d81cae25c06f8a487a3041)

Conflicts:
    src/mds/MDCache.cc
- g_conf-> instead of g_conf()->
---

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index 093f38c3581c..76a5aa20c2c8 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -788,6 +788,11 @@ void Migrator::export_dir(CDir *dir, mds_rank_t dest)
   assert(dir->is_auth());
   assert(dest != mds->get_nodeid());
    
+  if (!mds->is_stopping() && !dir->inode->is_exportable(dest)) {
+    dout(25) << "dir is export pinned" << dendl;
+    return;
+  }
+
   if (!(mds->is_active() || mds->is_stopping())) {
     dout(7) << "i'm not active, no exports for now" << dendl;
     return;
@@ -816,11 +821,6 @@ void Migrator::export_dir(CDir *dir, mds_rank_t dest)
       dout(7) << "i won't export anything in stray" << dendl;
       return;
     }
-  } else {
-    if (!mds->is_stopping() && !dir->inode->is_exportable(dest)) {
-      dout(7) << "dir is export pinned" << dendl;
-      return;
-    }
   }
 
   if (dir->is_frozen() ||