mds: do not try to export pin special directories

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index 9a68bf11884019ef58ac0576b465dc68ada3977b..4566d7885c7fdca7f66ac9ae2dda933b67f79a1b 100644 (file)
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -4416,7 +4416,7 @@ private:
 
 void CInode::maybe_export_pin()
 {
-  if (g_conf->mds_bal_export_pin && is_dir()) {
+  if (g_conf->mds_bal_export_pin && is_dir() && is_normal()) {
     dout(20) << "maybe_export_pin " << *this << dendl;
     mds_rank_t pin = get_projected_inode()->export_pin;
     if (pin == mdcache->mds->get_nodeid()) {

diff --git a/src/mds/CInode.h b/src/mds/CInode.h
index 05659df80c2beb72fff2cf5e2144eaa67301be74..843dedebf9042071794e26d59533290eba378b06 100644 (file)
--- a/src/mds/CInode.h
+++ b/src/mds/CInode.h
@@ -704,6 +704,7 @@ public:
   bool is_mdsdir() const { return MDS_INO_IS_MDSDIR(inode.ino); }
   bool is_base() const { return is_root() || is_mdsdir(); }
   bool is_system() const { return inode.ino < MDS_INO_SYSTEM_BASE; }
+  bool is_normal() const { return !(is_base() || is_system() || is_stray()); }
 
   bool is_head() const { return last == CEPH_NOSNAP; }