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

mds/MDSDaemon: catch cmd_bad_get

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2018-08-13 13:28:28 -05:00
parent 88df536908
commit 9539441781
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/mds/MDSDaemon.cc
View File

@ -132,7 +132,11 @@ bool MDSDaemon::asok_command(std::string_view command, const cmdmap_t& cmdmap,
dout(1) << "Can't run that command on an inactive MDS!" << dendl;
f->dump_string("error", "mds_not_active");
} else {
handled = mds_rank->handle_asok_command(command, cmdmap, f, ss);
try {
handled = mds_rank->handle_asok_command(command, cmdmap, f, ss);
} catch (const bad_cmd_get& e) {
ss << e.what();
}
}
}
f->flush(ss);
@ -616,7 +620,12 @@ void MDSDaemon::handle_command(const MCommand::const_ref &m)
r = -EINVAL;
outs = ss.str();
} else {
r = _handle_command(cmdmap, m, &outbl, &outs, &run_after, &need_reply);
try {
r = _handle_command(cmdmap, m, &outbl, &outs, &run_after, &need_reply);
} catch (const bad_cmd_get& e) {
outs = e.what();
r = -EINVAL;
}
}
priv.reset();
@ -850,12 +859,18 @@ int MDSDaemon::_handle_command(
r = -EINVAL;
}
else {
bool handled = mds_rank->handle_command(cmdmap, m, &r, &ds, &ss,
need_reply);
if (!handled) {
// MDSDaemon doesn't know this command
ss << "unrecognized command! " << prefix;
r = -EINVAL;
bool handled;
try {
handled = mds_rank->handle_command(cmdmap, m, &r, &ds, &ss,
need_reply);
if (!handled) {
// MDSDaemon doesn't know this command
ss << "unrecognized command! " << prefix;
r = -EINVAL;
}
} catch (const bad_cmd_get& e) {
ss << e.what();
r = -EINVAL;
}
}
}