RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-27 14:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

client: connect to export targets on cap EXPORT

Browse Source 
Also unconditionally connect on reconnect, even when there aren't any
outstanding requests.

Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2010-12-01 09:44:58 -08:00
parent 4592c22041
commit 792b04ba1e
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/client/Client.cc
View File

@ -918,20 +918,18 @@ out:
void Client::connect_mds_targets(int mds)
{
//this function shouldn't be called unless we lost a connection
assert (mds_sessions.count(mds));
MDSSession *s = mds_sessions[mds];
if (!s->requests.empty()) {
const MDSMap::mds_info_t& info = mdsmap->get_mds_info(mds);
for (set<int>::const_iterator q = info.export_targets.begin();
q != info.export_targets.end();
q++) {
if (mds_sessions.count(*q) == 0 && waiting_for_session.count(mds) == 0) {
dout(10) << "check_mds_sessions opening mds" << mds
<< " export target mds" << *q << dendl;
messenger->send_message(new MClientSession(CEPH_SESSION_REQUEST_OPEN),
mdsmap->get_inst(*q));
waiting_for_session[*q].size();
}
dout(10) << "connect_mds_targets for mds" << mds << dendl;
assert(mds_sessions.count(mds));
const MDSMap::mds_info_t& info = mdsmap->get_mds_info(mds);
for (set<int>::const_iterator q = info.export_targets.begin();
q != info.export_targets.end();
q++) {
if (mds_sessions.count(*q) == 0 && waiting_for_session.count(mds) == 0) {
dout(10) << "check_mds_sessions opening mds" << mds
<< " export target mds" << *q << dendl;
messenger->send_message(new MClientSession(CEPH_SESSION_REQUEST_OPEN),
mdsmap->get_inst(*q));
waiting_for_session[*q].size();
}
}
}
@ -2715,8 +2713,7 @@ void Client::handle_cap_import(Inode *in, MClientCaps *m)
m->put();
}
void Client::handle_cap_export(Inode *in, MClientCaps *m,
bool& open_target_sessions)
void Client::handle_cap_export(Inode *in, MClientCaps *m)
{
int mds = m->get_source().num();
InodeCap *cap = NULL;
@ -2744,6 +2741,9 @@ void Client::handle_cap_export(Inode *in, MClientCaps *m,
in->exporting_issued = cap->issued;
in->exporting_mseq = m->get_mseq();
in->exporting_mds = mds;
// open export targets, so we'll get the matching IMPORT
connect_mds_targets(mds);
} else
dout(5) << "handle_cap_export ino " << m->get_ino() << " mseq " << m->get_mseq()
<< " EXPORT from mds" << mds