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

mon: Allow ceph mds fail <name>

Browse Source 
Formerly we only allowed "ceph mds fail <rank>", and also failed to
check if rank was correctly parsed.

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
This commit is contained in:
Colin Patrick McCabe 2011-01-18 07:57:53 -08:00
parent e5b786952f
commit 08110f10cc
3 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mds/MDSMap.h
View File

@ -293,6 +293,16 @@ public:
return p->first;
}
const mds_info_t* find_by_name(const string& name) const {
for (map<uint64_t,mds_info_t>::const_iterator p = mds_info.begin();
p != mds_info.end();
++p) {
if (p->second.name == name)
return &p->second;
}
return NULL;
}
uint64_t find_standby_for(int mds, string& name) {
for (map<uint64_t,mds_info_t>::const_iterator p = mds_info.begin();
p != mds_info.end();

47
src/mon/MDSMonitor.cc
View File

@ -552,6 +552,34 @@ bool MDSMonitor::preprocess_command(MMonCommand *m)
return false;
}
int MDSMonitor::fail_mds(std::ostream &ss, const std::string &arg)
{
std::string err;
int w = strict_strtol(arg.c_str(), 10, &err);
if (!err.empty()) {
// Try to interpret the arg as an MDS name
const MDSMap::mds_info_t *mds_info = mdsmap.find_by_name(arg);
if (!mds_info) {
ss << "Can't find any MDS named '" << arg << "'";
return -ENOENT;
}
w = mds_info->rank;
}
if (pending_mdsmap.up.count(w) &&
pending_mdsmap.mds_info.count(pending_mdsmap.up[w])) {
utime_t until = g_clock.now();
until += g_conf.mds_blacklist_interval;
MDSMap::mds_info_t& info = pending_mdsmap.mds_info[pending_mdsmap.up[w]];
pending_mdsmap.last_failure_osd_epoch = mon->osdmon()->blacklist(info.addr, until);
mon->osdmon()->propose_pending();
}
pending_mdsmap.failed.insert(w);
pending_mdsmap.up.erase(w);
ss << "failed mds" << w;
return 0;
}
bool MDSMonitor::prepare_command(MMonCommand *m)
{
int r = -EINVAL;
@ -608,24 +636,7 @@ bool MDSMonitor::prepare_command(MMonCommand *m)
}
}
else if (m->cmd[1] == "fail" && m->cmd.size() == 3) {
int w = atoi(m->cmd[2].c_str());
if (pending_mdsmap.up.count(w) &&
pending_mdsmap.mds_info.count(pending_mdsmap.up[w])) {
utime_t until = g_clock.now();
until += g_conf.mds_blacklist_interval;
MDSMap::mds_info_t& info = pending_mdsmap.mds_info[pending_mdsmap.up[w]];
pending_mdsmap.last_failure_osd_epoch = mon->osdmon()->blacklist(info.addr, until);
mon->osdmon()->propose_pending();
}
pending_mdsmap.failed.insert(w);
pending_mdsmap.up.erase(w);
stringstream ss;
ss << "failed mds" << w;
string rs;
getline(ss, rs);
paxos->wait_for_commit(new Monitor::C_Command(mon, m, 0, rs, paxos->get_version()));
return true;
r = fail_mds(ss, m->cmd[2]);
}
else if (m->cmd[1] == "rm" && m->cmd.size() == 3) {
uint64_t gid = atoll(m->cmd[2].c_str());

1
src/mon/MDSMonitor.h
View File

@ -88,6 +88,7 @@ class MDSMonitor : public PaxosService {
enum health_status_t get_health(std::ostream &ss) const;
bool preprocess_command(MMonCommand *m);
int fail_mds(std::ostream &ss, const std::string &arg);
bool prepare_command(MMonCommand *m);
// beacons