From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 1 May 2018 00:25:58 +0000 (-0700)
Subject: Merge PR #21719 into master
X-Git-Tag: v13.1.0~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=49365c70dca0082fcde3e468c85f58adc2731b65;p=ceph.git

Merge PR #21719 into master

* refs/pull/21719/head:
	mds: trim log during shutdown to clean metadata

Reviewed-by: Zheng Yan <zyan@redhat.com>
---

49365c70dca0082fcde3e468c85f58adc2731b65
diff --cc src/mds/MDCache.cc
index c947be26e356,62a4b8f7ce5a..eb07de00ed1a
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@@ -7706,10 -7676,11 +7706,10 @@@ bool MDCache::shutdown_pass(
    trim(UINT64_MAX);
    dout(5) << "lru size now " << lru.lru_get_size() << "/" << bottom_lru.lru_get_size() << dendl;
  
-   // SUBTREES
+   // Export all subtrees to another active (usually rank 0) if not rank 0
    int num_auth_subtree = 0;
    if (!subtrees.empty() &&
 -      mds->get_nodeid() != 0 && 
 -      migrator->get_export_queue_size() == 0) {
 +      mds->get_nodeid() != 0) {
      dout(7) << "looking for subtrees to export to mds0" << dendl;
      list<CDir*> ls;
      for (map<CDir*, set<CDir*> >::iterator it = subtrees.begin();