RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 18:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #21593 into master

Browse Source 
* refs/pull/21593/head:
	mds: properly check auth subtree count in MDCache::shutdown_pass()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2018-04-29 11:05:22 -07:00
commit e7856ffa04
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mds/MDCache.cc
View File

@ -7697,8 +7697,7 @@ bool MDCache::shutdown_pass()
// SUBTREES
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();
@ -7717,6 +7716,8 @@ bool MDCache::shutdown_pass()
ls.push_back(dir);
}
}
migrator->clear_export_queue();
for (list<CDir*>::iterator p = ls.begin(); p != ls.end(); ++p) {
CDir *dir = *p;
mds_rank_t dest = dir->get_inode()->authority().first;