From 14884f257a7aa735e59c97b306411cf7440d4f8f Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Mon, 14 Nov 2016 18:30:35 -0500 Subject: [PATCH] mds: revert "mds/Mutation: remove redundant _dump method" This reverts commit 93d0fc9d937186861b41b054235955475c65b5c1. This commit had the unintentional side-effect of preventing TrackedOp dumps from including MDS specific events. Fixes: http://tracker.ceph.com/issues/17906 Signed-off-by: Patrick Donnelly --- src/mds/Mutation.cc | 5 +++++ src/mds/Mutation.h | 1 + 2 files changed, 6 insertions(+) diff --git a/src/mds/Mutation.cc b/src/mds/Mutation.cc index e8873e82631d..2b39e5929497 100644 --- a/src/mds/Mutation.cc +++ b/src/mds/Mutation.cc @@ -314,6 +314,11 @@ void MDRequestImpl::print(ostream &out) const } void MDRequestImpl::dump(Formatter *f) const +{ + _dump(ceph_clock_now(g_ceph_context), f); +} + +void MDRequestImpl::_dump(utime_t now, Formatter *f) const { f->dump_string("flag_point", state_string()); f->dump_stream("reqid") << reqid; diff --git a/src/mds/Mutation.h b/src/mds/Mutation.h index 3906d4b65f9c..ed7d5af2028a 100644 --- a/src/mds/Mutation.h +++ b/src/mds/Mutation.h @@ -333,6 +333,7 @@ struct MDRequestImpl : public MutationImpl, public TrackedOp { // TrackedOp stuff typedef ceph::shared_ptr Ref; protected: + void _dump(utime_t now, Formatter *f) const; void _dump_op_descriptor_unlocked(ostream& stream) const; }; -- 2.47.3