From: zhangzhi <zhangzhi@localhost.localdomain>
Date: Fri, 10 Jul 2015 09:10:30 +0000 (+0800)
Subject: Fix mds dump_ops_in_flight crashing ocassionally
X-Git-Tag: v9.0.3~53^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5175%2Fhead;p=ceph.git

Fix mds dump_ops_in_flight crashing ocassionally
---

diff --git a/src/mds/Mutation.cc b/src/mds/Mutation.cc
index 27eadf9d82e6..7dbc6e7ed6fd 100644
--- a/src/mds/Mutation.cc
+++ b/src/mds/Mutation.cc
@@ -329,7 +329,7 @@ void MDRequestImpl::_dump(utime_t now, Formatter *f) const
       f->dump_stream("client") << client_request->get_orig_source();
       f->dump_int("tid", client_request->get_tid());
       f->close_section(); // client_info
-    } else if (slave_request && !slave_request->is_reply()) { // replies go to an existing mdr
+    } else if (is_slave() && slave_request) { // replies go to an existing mdr
       f->dump_string("op_type", "slave_request");
       f->open_object_section("master_info");
       f->dump_stream("master") << slave_request->get_orig_source();
diff --git a/src/mds/Mutation.h b/src/mds/Mutation.h
index bc091c7b2880..f43d6609bacb 100644
--- a/src/mds/Mutation.h
+++ b/src/mds/Mutation.h
@@ -110,8 +110,8 @@ public:
     assert(remote_wrlocks.empty());
   }
 
-  bool is_master() { return slave_to_mds == MDS_RANK_NONE; }
-  bool is_slave() { return slave_to_mds != MDS_RANK_NONE; }
+  bool is_master() const { return slave_to_mds == MDS_RANK_NONE; }
+  bool is_slave() const { return slave_to_mds != MDS_RANK_NONE; }
 
   client_t get_client() {
     if (reqid.name.is_client())