From 57c89bf8145e3d430691f9fb13a6690d52e89680 Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Sun, 18 May 2014 13:38:19 +0800 Subject: [PATCH] mds: fix Server::submit_mdlog_entry() mdr can be NULL when rolling back slave update Signed-off-by: Yan, Zheng --- src/mds/Server.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index b0f0a13d1631d..85645ea65c9df 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -826,10 +826,13 @@ public: void Server::submit_mdlog_entry(LogEvent *le, Context *fin, MDRequestRef& mdr, const char *event) { - string event_str("submit entry: "); - event_str += event; - mdr->mark_event(event_str); - mdlog->submit_entry(le, new C_MarkEvent(fin, mdr, event)); + if (mdr) { + string event_str("submit entry: "); + event_str += event; + mdr->mark_event(event_str); + mdlog->submit_entry(le, new C_MarkEvent(fin, mdr, event)); + } else + mdlog->submit_entry(le, fin); } /* -- 2.39.5