From: John Spray <jspray@redhat.com>
Date: Mon, 9 Jan 2017 13:05:51 +0000 (+0000)
Subject: Merge pull request #12274 from ukernel/wip-multimds-misc
X-Git-Tag: v12.0.0~253
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=30cfc81bdcd978eb9c7c70ee0655d94f634db7ea;p=ceph-ci.git

Merge pull request #12274 from ukernel/wip-multimds-misc

mds: misc multimds fixes

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
---

30cfc81bdcd978eb9c7c70ee0655d94f634db7ea
diff --cc src/mds/Migrator.cc
index 853b3fa99b4,64168a15640..c1cbc4cb870
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@@ -1808,13 -1829,8 +1830,8 @@@ void Migrator::export_finish(CDir *dir
    // finish export (adjust local cache state)
    int num_dentries = 0;
    C_ContextsBase<MDSInternalContextBase, MDSInternalContextGather> *fin = new C_ContextsBase<MDSInternalContextBase, MDSInternalContextGather>(g_ceph_context);
 -  finish_export_dir(dir, ceph_clock_now(g_ceph_context), it->second.peer,
 +  finish_export_dir(dir, ceph_clock_now(), it->second.peer,
  		    it->second.peer_imported, fin->contexts, &num_dentries);
-   dir->add_waiter(CDir::WAIT_UNFREEZE, fin);
- 
-   // unfreeze
-   dout(7) << "export_finish unfreezing" << dendl;
-   dir->unfreeze_tree();
    
    // unpin bounds
    set<CDir*> bounds;