From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 3 Jan 2019 22:02:52 +0000 (-0800)
Subject: mds: do not log internal journal error
X-Git-Tag: v12.2.12~109^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F26257%2Fhead;p=ceph.git

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 <pdonnell@redhat.com>
(cherry picked from commit 0992ac1fa62edb6143efc80a6fea7b4704107705)

Conflicts:
	src/mds/Server.cc
---

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));