From f9378a9abf159e6bd8ac35f8745ac65aba53a6e7 Mon Sep 17 00:00:00 2001 From: zhangzhi Date: Fri, 10 Jul 2015 17:10:30 +0800 Subject: [PATCH] Fix mds dump_ops_in_flight crashing ocassionally --- src/mds/Mutation.cc | 2 +- src/mds/Mutation.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mds/Mutation.cc b/src/mds/Mutation.cc index 27eadf9d82e64..7dbc6e7ed6fd7 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 bc091c7b28800..f43d6609bacbd 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()) -- 2.39.5