RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

mds: resolve cleanup

Browse Source 
Only track ambiguous imports and such if we get a resolve message while in
the resolve state.

Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2010-11-19 13:58:31 -08:00
parent 0dddf4537e
commit cd53719f3c
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mds/MDCache.cc
View File

@ -2503,19 +2503,20 @@ void MDCache::handle_resolve(MMDSResolve *m)
show_subtrees();
// note ambiguous imports too
for (map<dirfrag_t, vector<dirfrag_t> >::iterator pi = m->ambiguous_imports.begin();
pi != m->ambiguous_imports.end();
++pi) {
dout(10) << "noting ambiguous import on " << pi->first << " bounds " << pi->second << dendl;
other_ambiguous_imports[from][pi->first].swap( pi->second );
if (mds->is_resolve()) {
// note ambiguous imports too
for (map<dirfrag_t, vector<dirfrag_t> >::iterator pi = m->ambiguous_imports.begin();
pi != m->ambiguous_imports.end();
++pi) {
dout(10) << "noting ambiguous import on " << pi->first << " bounds " << pi->second << dendl;
other_ambiguous_imports[from][pi->first].swap( pi->second );
}
// did i get them all?
got_resolve.insert(from);
maybe_resolve_finish();
}
// did i get them all?
got_resolve.insert(from);
maybe_resolve_finish();
m->put();
}