From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 14 Nov 2016 23:30:35 +0000 (-0500)
Subject: mds: revert "mds/Mutation: remove redundant _dump method"
X-Git-Tag: v11.1.0~281^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=14884f257a7aa735e59c97b306411cf7440d4f8f;p=ceph-ci.git

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 <pdonnell@redhat.com>
---

diff --git a/src/mds/Mutation.cc b/src/mds/Mutation.cc
index e8873e82631..2b39e592949 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 3906d4b65f9..ed7d5af2028 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<MDRequestImpl> Ref;
 protected:
+  void _dump(utime_t now, Formatter *f) const;
   void _dump_op_descriptor_unlocked(ostream& stream) const;
 };