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

Merge pull request #33198 from simon-rock/simon_work_get_dirfrag_bound

Browse Source 
mds: optimize function, get_force_dirfrag_bound_set
This commit is contained in:
Yan, Zheng 2020-03-26 17:06:08 +08:00 committed by GitHub
commit baff8b366d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mds/MDCache.cc
View File

@ -1166,7 +1166,6 @@ void MDCache::get_force_dirfrag_bound_set(const vector<dirfrag_t>& dfs, set<CDir
frag_vec_t leaves; frag_vec_t leaves;
diri->dirfragtree.get_leaves_under(fg, leaves); diri->dirfragtree.get_leaves_under(fg, leaves);
if (leaves.empty()) { if (leaves.empty()) {
bool all = true;
frag_t approx_fg = diri->dirfragtree[fg.value()]; frag_t approx_fg = diri->dirfragtree[fg.value()];
frag_vec_t approx_leaves; frag_vec_t approx_leaves;
tmpdft.get_leaves_under(approx_fg, approx_leaves); tmpdft.get_leaves_under(approx_fg, approx_leaves);
@ -1174,20 +1173,13 @@ void MDCache::get_force_dirfrag_bound_set(const vector<dirfrag_t>& dfs, set<CDir
if (p->second.get().count(leaf) == 0) { if (p->second.get().count(leaf) == 0) {
// not bound, so the resolve message is from auth MDS of the dirfrag // not bound, so the resolve message is from auth MDS of the dirfrag
force_dir_fragment(diri, leaf); force_dir_fragment(diri, leaf);
all = false;
} }
} }
if (all)
leaves.push_back(approx_fg);
else
diri->dirfragtree.get_leaves_under(fg, leaves);
}
dout(10) << " frag " << fg << " contains " << leaves << dendl;
for (const auto& leaf : leaves) {
CDir *dir = diri->get_dirfrag(leaf);
if (dir)
bounds.insert(dir);
} }
auto&& [complete, sibs] = diri->get_dirfrags_under(fg);
for (const auto& sib : sibs)
bounds.insert(sib);
} }
} }
} }