Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

luminous: mds: tell session ls returns vanila EINVAL when MDS is not active #19505

Merged
merged 2 commits into from Jan 8, 2018
Merged

luminous: mds: tell session ls returns vanila EINVAL when MDS is not active #19505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42bb91a
mds: Fix error message when mds not active
joscollin Nov 22, 2017
ca980a6
pybind: return error message when ceph_mds_command() returns error
joscollin Nov 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/mds/MDSDaemon.cc
View file
Open in desktop
Expand Up @@ -823,18 +823,19 @@ int MDSDaemon::_handle_command(
cpu_profiler_handle_command(argvec, ds);
} else {
// Give MDSRank a shot at the command
if (mds_rank) {
if (!mds_rank) {
ss << "MDS not active";
r = -EINVAL;
}
else {
bool handled = mds_rank->handle_command(cmdmap, m, &r, &ds, &ss,
need_reply);
if (handled) {
goto out;
if (!handled) {
// MDSDaemon doesn't know this command
ss << "unrecognized command! " << prefix;
r = -EINVAL;
}
}

// Neither MDSDaemon nor MDSRank know this command
std::ostringstream ss;
ss << "unrecognized command! " << prefix;
r = -EINVAL;
}

out:
Expand Down
25 changes: 11 additions & 14 deletions src/pybind/cephfs/cephfs.pyx
View file
Open in desktop
Expand Up @@ -962,10 +962,10 @@ cdef class LibCephFS(object):
char *_inbuf = input_data
size_t _inbuf_len = len(input_data)

char *_outbuf
size_t _outbuf_len
char *_outs
size_t _outs_len
char *_outbuf = NULL
size_t _outbuf_len = 0
char *_outs = NULL
size_t _outs_len = 0

try:
with nogil:
Expand All @@ -974,15 +974,12 @@ cdef class LibCephFS(object):
<const char*>_inbuf, _inbuf_len,
&_outbuf, &_outbuf_len,
&_outs, &_outs_len)
if ret == 0:
my_outs = decode_cstr(_outs[:_outs_len])
my_outbuf = _outbuf[:_outbuf_len]
if _outs_len:
ceph_buffer_free(_outs)
if _outbuf_len:
ceph_buffer_free(_outbuf)
return (ret, my_outbuf, my_outs)
else:
return (ret, b"", "")
my_outs = decode_cstr(_outs[:_outs_len])
my_outbuf = _outbuf[:_outbuf_len]
if _outs_len:
ceph_buffer_free(_outs)
if _outbuf_len:
ceph_buffer_free(_outbuf)
return (ret, my_outbuf, my_outs)
finally:
free(_cmd)