git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1140 29311d96-e01e-0410-9327-a35deaab8ce9
This commit is contained in:
sageweil 2007-02-28 23:15:51 +00:00
parent a476b85b8f
commit 1e0a427691

View File

@ -440,12 +440,6 @@ void MDS::handle_mds_map(MMDSMap *m)
// decode and process
mdsmap->decode(m->get_encoded());
// tell objecter my incarnation
if (objecter->get_client_incarnation() < 0) {
assert(mdsmap->get_inc(whoami) > 0);
objecter->set_client_incarnation(mdsmap->get_inc(whoami));
}
// see who i am
whoami = mdsmap->get_inst_rank(messenger->get_myaddr());
if (oldwhoami != whoami) {
@ -466,6 +460,13 @@ void MDS::handle_mds_map(MMDSMap *m)
}
}
// tell objecter my incarnation
if (objecter->get_client_incarnation() < 0 &&
mdsmap->have_inst(whoami)) {
assert(mdsmap->get_inc(whoami) > 0);
objecter->set_client_incarnation(mdsmap->get_inc(whoami));
}
// update my state
state = mdsmap->get_state(whoami);