]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mds: do not log internal journal error
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 3 Jan 2019 22:02:52 +0000 (14:02 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 4 Jan 2019 22:34:32 +0000 (14:34 -0800)
MDS can't reach this code due to assert in C_MDS_session_finish.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
src/mds/Server.cc

index dff5853f0388e8d6ed3446f5a215a765e2b4d317..00d291e90719ea40946100080f9fc925484eb145 100644 (file)
@@ -589,14 +589,8 @@ void Server::handle_client_session(const MClientSession::const_ref &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 {
-          CachedStackStringStream _ss;
-          auto& ss = _ss.get_stream();
-          ss << "(internal) r = " << r;
-          log_session_status("REJECTED", ss.strv());
-        }
+        ceph_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));