]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: do not log internal journal error 26257/head
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 3 Jan 2019 22:02:52 +0000 (14:02 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Sun, 3 Feb 2019 23:36:15 +0000 (15:36 -0800)
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

src/mds/Server.cc

index 9846ea578d7dea4d2fd7fb416c22526fa5eb7b26..5e8f21b221bf29840d7c6ca675854a19993a2777 100644 (file)
@@ -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));