From 324737d2adb94cb41c00134baafc2227899c84cd Mon Sep 17 00:00:00 2001 From: sageweil Date: Tue, 9 Oct 2007 20:28:28 +0000 Subject: [PATCH] only verify all subtrees unambiguous when recovering git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1901 29311d96-e01e-0410-9327-a35deaab8ce9 --- branches/sage/mds/mds/MDCache.cc | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/branches/sage/mds/mds/MDCache.cc b/branches/sage/mds/mds/MDCache.cc index c0f128b0ea6b2..3eacfe1d13320 100644 --- a/branches/sage/mds/mds/MDCache.cc +++ b/branches/sage/mds/mds/MDCache.cc @@ -1508,14 +1508,18 @@ void MDCache::disambiguate_imports() } assert(my_ambiguous_imports.empty()); - // verify all my subtrees are unambiguous! - for (map >::iterator p = subtrees.begin(); - p != subtrees.end(); - ++p) { - CDir *dir = p->first; - if (dir->is_ambiguous_dir_auth()) - dout(0) << "disambiguate_imports uh oh, dir_auth is still ambiguous for " << *dir << dendl; - assert(!dir->is_ambiguous_dir_auth()); + if (mds->is_resolve()) { + // verify all my subtrees are unambiguous! + for (map >::iterator p = subtrees.begin(); + p != subtrees.end(); + ++p) { + CDir *dir = p->first; + if (dir->is_ambiguous_dir_auth()) { + dout(0) << "disambiguate_imports uh oh, dir_auth is still ambiguous for " << *dir << dendl; + show_subtrees(); + } + assert(!dir->is_ambiguous_dir_auth()); + } } show_subtrees(); -- 2.39.5