From: Yan, Zheng <zyan@redhat.com>
Date: Thu, 20 Oct 2016 09:42:08 +0000 (+0800)
Subject: mds: add debug assertion for issue #17636
X-Git-Tag: v11.1.0~535^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3c3f7a1dafd0aff5919293748ad0f8d88d3658b2;p=ceph.git

mds: add debug assertion for issue #17636

Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index 501216d079e19..07e2e090c9b71 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -922,7 +922,7 @@ void Migrator::export_frozen(CDir *dir, uint64_t tid)
   }
 
   assert(it->second.state == EXPORT_FREEZING);
-  assert(dir->is_frozen());
+  assert(dir->is_frozen_tree_root());
   assert(dir->get_cum_auth_pins() == 0);
 
   CInode *diri = dir->get_inode();
@@ -1220,6 +1220,7 @@ void Migrator::export_go_synced(CDir *dir, uint64_t tid)
   it->second.state = EXPORT_EXPORTING;
   assert(g_conf->mds_kill_export_at != 7);
 
+  assert(dir->is_frozen_tree_root());
   assert(dir->get_cum_auth_pins() == 0);
 
   // set ambiguous auth