TrackedOp:_dump_op_descriptor is renamed to _dump_op_descriptor_unlocked

Caller don't need to hold lock before calling _dump_op_descriptor(),so,
to reflect this it is renamed to _dump_op_descriptor_unlocked().

Signed-off-by: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
Signed-off-by: Somnath Roy <somnath.roy@sandisk.com>

diff --git a/src/common/TrackedOp.cc b/src/common/TrackedOp.cc
index 9ad8e447b4c980ca1fca082a19e47d0a17a05df2..11863a48019416e31f294d07eaf52dcf116a2f6f 100644 (file)
--- a/src/common/TrackedOp.cc
+++ b/src/common/TrackedOp.cc
@@ -169,7 +169,7 @@ bool OpTracker::check_ops_in_flight(std::vector<string> &warning_vector)
       stringstream ss;
       ss << "slow request " << age << " seconds old, received at "
          << (*i)->get_initiated() << ": ";
-      (*i)->_dump_op_descriptor(ss);
+      (*i)->_dump_op_descriptor_unlocked(ss);
       ss << " currently "
         << ((*i)->current.size() ? (*i)->current : (*i)->state_string());
       warning_vector.push_back(ss.str());
@@ -232,7 +232,7 @@ void OpTracker::_mark_event(TrackedOp *op, const string &evt,
                            utime_t time)
 {
   stringstream ss;
-  op->_dump_op_descriptor(ss);
+  op->_dump_op_descriptor_unlocked(ss);
   dout(5) << //"reqid: " << op->get_reqid() <<
             ", seq: " << op->seq
          << ", time: " << time << ", event: " << evt
@@ -267,7 +267,7 @@ void TrackedOp::mark_event(const string &event)
 void TrackedOp::dump(utime_t now, Formatter *f) const
 {
   stringstream name;
-  _dump_op_descriptor(name);
+  _dump_op_descriptor_unlocked(name);
   f->dump_string("description", name.str().c_str()); // this TrackedOp
   f->dump_stream("initiated_at") << get_initiated();
   f->dump_float("age", now - get_initiated());

diff --git a/src/common/TrackedOp.h b/src/common/TrackedOp.h
index 9a06d12791c1b10da01ff001a356fca1d72ee960..b08c2aa6f398d36b9dcb5865f15d110d8e11a6b1 100644 (file)
--- a/src/common/TrackedOp.h
+++ b/src/common/TrackedOp.h
@@ -149,7 +149,7 @@ protected:
   /// if you want something else to happen when events are marked, implement
   virtual void _event_marked() {}
   /// return a unique descriptor of the Op; eg the message it's attached to
-  virtual void _dump_op_descriptor(ostream& stream) const = 0;
+  virtual void _dump_op_descriptor_unlocked(ostream& stream) const = 0;
   /// called when the last non-OpTracker reference is dropped
   virtual void _unregistered() {};
 

diff --git a/src/mds/Mutation.cc b/src/mds/Mutation.cc
index f2ea0cea4f9b3b976648301d857517d6a24b3eb7..9335189c32fe1d0844baad81d42d71e4caa8e71a 100644 (file)
--- a/src/mds/Mutation.cc
+++ b/src/mds/Mutation.cc
@@ -343,7 +343,7 @@ void MDRequestImpl::_dump(utime_t now, Formatter *f) const
   }
 }
 
-void MDRequestImpl::_dump_op_descriptor(ostream& stream) const
+void MDRequestImpl::_dump_op_descriptor_unlocked(ostream& stream) const
 {
   if (client_request) {
     client_request->print(stream);

diff --git a/src/mds/Mutation.h b/src/mds/Mutation.h
index ed3f0fa0d474654831eda7a47c29a83d2697fdf1..fee0ad164b8b914e1a832655a4d6f2824a81cb09 100644 (file)
--- a/src/mds/Mutation.h
+++ b/src/mds/Mutation.h
@@ -324,7 +324,7 @@ struct MDRequestImpl : public MutationImpl, public TrackedOp {
   typedef ceph::shared_ptr<MDRequestImpl> Ref;
 protected:
   void _dump(utime_t now, Formatter *f) const;
-  void _dump_op_descriptor(ostream& stream) const;
+  void _dump_op_descriptor_unlocked(ostream& stream) const;
 };
 
 typedef ceph::shared_ptr<MDRequestImpl> MDRequestRef;

diff --git a/src/osd/OpRequest.cc b/src/osd/OpRequest.cc
index 8e2ffb2797918c6947f785bcfa848701b60845a3..a6ee3ee5dfcf99bf9993420054465a5104ae7a2b 100644 (file)
--- a/src/osd/OpRequest.cc
+++ b/src/osd/OpRequest.cc
@@ -60,7 +60,7 @@ void OpRequest::_dump(utime_t now, Formatter *f) const
   }
 }
 
-void OpRequest::_dump_op_descriptor(ostream& stream) const
+void OpRequest::_dump_op_descriptor_unlocked(ostream& stream) const
 {
   get_req()->print(stream);
 }

diff --git a/src/osd/OpRequest.h b/src/osd/OpRequest.h
index 4c9795847b27086cdf220410b80fedea6f336286..b9bfa9b3ef3b3335b6e5ebe5a8906a82864a45b8 100644 (file)
--- a/src/osd/OpRequest.h
+++ b/src/osd/OpRequest.h
@@ -94,7 +94,7 @@ private:
   OpRequest(Message *req, OpTracker *tracker);
 
 protected:
-  void _dump_op_descriptor(ostream& stream) const;
+  void _dump_op_descriptor_unlocked(ostream& stream) const;
   void _unregistered();
 
 public: