RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-25 03:52:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

mds/MDSDaemon: make con disposable before passing message to asok

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2019-12-09 22:38:57 -06:00
parent b6634d4668
commit 63f57ded6c
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/mds/MDSDaemon.cc
View File

@ -591,6 +591,22 @@ void MDSDaemon::handle_command(const cref_t<MCommand> &m)
std::string outs;
bufferlist outbl;
// If someone is using a closed session for sending commands (e.g.
// the ceph CLI) then we should feel free to clean up this connection
// as soon as we've sent them a response.
const bool live_session =
session->get_state_seq() > 0 &&
mds_rank &&
mds_rank->sessionmap.get_session(session->info.inst.name);
if (!live_session) {
// This session only existed to issue commands, so terminate it
// as soon as we can.
ceph_assert(session->is_closed());
session->get_connection()->mark_disposable();
}
priv.reset();
if (!session->auth_caps.allow_all()) {
dout(1) << __func__
<< ": received command from client without `tell` capability: "
@ -610,22 +626,6 @@ void MDSDaemon::handle_command(const cref_t<MCommand> &m)
return;
}
// If someone is using a closed session for sending commands (e.g.
// the ceph CLI) then we should feel free to clean up this connection
// as soon as we've sent them a response.
const bool live_session =
session->get_state_seq() > 0 &&
mds_rank &&
mds_rank->sessionmap.get_session(session->info.inst.name);
if (!live_session) {
// This session only existed to issue commands, so terminate it
// as soon as we can.
ceph_assert(session->is_closed());
session->get_connection()->mark_disposable();
}
priv.reset();
auto reply = make_message<MCommandReply>(r, outs);
reply->set_tid(m->get_tid());
reply->set_data(outbl);