mds: avoid recursive locks dumping state

Also: fix return to std::string. A string_view is not a thread-safe return.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/src/common/TrackedOp.h b/src/common/TrackedOp.h
index 49ddf019bdd0b4c77359c939b233c47e3fb51d17..af0e036baf4438e9bb4c5e6a59f2676a5ee7281f 100644 (file)
--- a/src/common/TrackedOp.h
+++ b/src/common/TrackedOp.h
@@ -392,9 +392,9 @@ public:
     warn_interval_multiplier = 0;
   }
 
-  virtual std::string_view state_string() const {
+  std::string state_string() const {
     std::lock_guard l(lock);
-    return events.empty() ? std::string_view() : std::string_view(events.rbegin()->str);
+    return _get_state_string();
   }
 
   void dump(utime_t now, ceph::Formatter *f) const;
@@ -414,6 +414,11 @@ public:
   friend void intrusive_ptr_release(TrackedOp *o) {
     o->put();
   }
+
+protected:
+  virtual std::string _get_state_string() const {
+    return events.empty() ? std::string() : std::string(events.rbegin()->str);
+  }
 };
 
 

diff --git a/src/mds/Mutation.cc b/src/mds/Mutation.cc
index 6a244b154c94ee96944c8db680d121f4ae17234e..518c68b679c7cfbca69f580bb89b038fa01f5079 100644 (file)
--- a/src/mds/Mutation.cc
+++ b/src/mds/Mutation.cc
@@ -481,7 +481,7 @@ void MDRequestImpl::dump(Formatter *f) const
 
 void MDRequestImpl::_dump(Formatter *f) const
 {
-  f->dump_string("flag_point", state_string());
+  f->dump_string("flag_point", _get_state_string());
   f->dump_stream("reqid") << reqid;
   {
     msg_lock.lock();

diff --git a/src/osd/OpRequest.h b/src/osd/OpRequest.h
index c1a69e08e7e84e6b5bd4055c65d4e8fe02658852..8df4f25d53e595348eeccb7f89ae74fa768f458b 100644 (file)
--- a/src/osd/OpRequest.h
+++ b/src/osd/OpRequest.h
@@ -113,7 +113,7 @@ public:
     return latest_flag_point;
   }
 
-  std::string_view state_string() const override {
+  std::string _get_state_string() const override {
     switch(latest_flag_point) {
     case flag_queued_for_pg: return "queued for pg";
     case flag_reached_pg: return "reached pg";