RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 00:46:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

mon: handle DNE beacon from MDS

Browse Source 
...by calling fail_mds_gid for that MDS.

Signed-off-by: John Spray <john.spray@redhat.com>
This commit is contained in:
John Spray 2015-05-12 14:57:17 +01:00
parent c565d8721b
commit 7fe435ccee
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mon/MDSMonitor.cc
View File

@ -579,6 +579,21 @@ bool MDSMonitor::prepare_beacon(MMDSBeacon *m)
// after we remove the instance from the map.
pending_mdsmap.mds_info.erase(gid);
// Respond to MDS, so that it knows it can continue to shut down
mon->send_reply(m, new MMDSBeacon(mon->monmap->fsid, m->get_global_id(),
m->get_name(), mdsmap.get_epoch(), state, seq));
} else if (state == MDSMap::STATE_DNE) {
if (!mon->osdmon()->is_writeable()) {
dout(4) << __func__ << ": DNE from rank " << info.rank
<< " waiting for osdmon writeable to blacklist it" << dendl;
mon->osdmon()->wait_for_writeable(new C_RetryMessage(this, m));
return false;
}
fail_mds_gid(gid);
assert(mon->osdmon()->is_writeable());
request_proposal(mon->osdmon());
// Respond to MDS, so that it knows it can continue to shut down
mon->send_reply(m, new MMDSBeacon(mon->monmap->fsid, m->get_global_id(),
m->get_name(), mdsmap.get_epoch(), state, seq));
@ -940,6 +955,8 @@ void MDSMonitor::fail_mds_gid(mds_gid_t gid)
}
pending_mdsmap.mds_info.erase(gid);
last_beacon.erase(gid);
}
mds_gid_t MDSMonitor::gid_from_arg(const std::string& arg, std::ostream &ss)