From 7b134974142e803171d022b8522e621c9ca09069 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 3 Jan 2019 14:02:52 -0800 Subject: [PATCH] mds: do not log internal journal error MDS can't reach this code due to assert in C_MDS_session_finish. Signed-off-by: Patrick Donnelly (cherry picked from commit 0992ac1fa62edb6143efc80a6fea7b4704107705) Conflicts: src/mds/Server.cc --- src/mds/Server.cc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 9846ea578d7d..5e8f21b221bf 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -436,13 +436,8 @@ void Server::handle_client_session(MClientSession *m) sseq = mds->sessionmap.set_state(session, Session::STATE_OPENING); mds->sessionmap.touch_session(session); auto fin = new FunctionContext([log_session_status = std::move(log_session_status)](int r){ - if (r == 0) { - log_session_status("ACCEPTED", ""); - } else { - std::stringstream ss; - ss << "(internal) r = " << r; - log_session_status("REJECTED", ss.str()); - } + assert(r == 0); + log_session_status("ACCEPTED", ""); }); mdlog->start_submit_entry(new ESession(m->get_source_inst(), true, pv, client_metadata), new C_MDS_session_finish(this, session, sseq, true, pv, fin)); -- 2.47.3