From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 10 Jul 2020 14:00:46 +0000 (-0400)
Subject: librbd: increased logging for asio::ContextWQ
X-Git-Tag: v16.1.0~1685^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5a4c61a7818d0a9c2b8536155a2ce1ef1fb34ce5;p=ceph.git

librbd: increased logging for asio::ContextWQ

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/librbd/AsioEngine.cc b/src/librbd/AsioEngine.cc
index 535ad57b5ac..d8cf48d3969 100644
--- a/src/librbd/AsioEngine.cc
+++ b/src/librbd/AsioEngine.cc
@@ -22,7 +22,7 @@ AsioEngine::AsioEngine(std::shared_ptr<librados::Rados> rados)
     m_cct(m_rados_api->cct()),
     m_io_context(m_rados_api->get_io_context()),
     m_api_strand(m_io_context),
-    m_context_wq(std::make_unique<asio::ContextWQ>(m_io_context)) {
+    m_context_wq(std::make_unique<asio::ContextWQ>(m_cct, m_io_context)) {
   ldout(m_cct, 20) << dendl;
 
   auto rados_threads = m_cct->_conf.get_val<uint64_t>("librados_thread_count");
diff --git a/src/librbd/asio/ContextWQ.cc b/src/librbd/asio/ContextWQ.cc
index 7d18f6f3d36..db4fadec69f 100644
--- a/src/librbd/asio/ContextWQ.cc
+++ b/src/librbd/asio/ContextWQ.cc
@@ -4,16 +4,28 @@
 #include "librbd/asio/ContextWQ.h"
 #include "include/Context.h"
 #include "common/Cond.h"
+#include "common/dout.h"
+
+#define dout_subsys ceph_subsys_rbd
+#undef dout_prefix
+#define dout_prefix *_dout << "librbd::asio::ContextWQ: " \
+                           << this << " " << __func__ << ": "
 
 namespace librbd {
 namespace asio {
 
-ContextWQ::ContextWQ(boost::asio::io_context& io_context)
-  : m_io_context(io_context), m_strand(io_context),
+ContextWQ::ContextWQ(CephContext* cct, boost::asio::io_context& io_context)
+  : m_cct(cct), m_io_context(io_context), m_strand(io_context),
     m_queued_ops(0) {
+  ldout(m_cct, 20) << dendl;
+}
+
+ContextWQ::~ContextWQ() {
+  ldout(m_cct, 20) << dendl;
 }
 
 void ContextWQ::drain() {
+  ldout(m_cct, 20) << dendl;
   C_SaferCond ctx;
   drain_handler(&ctx);
   ctx.wait();
diff --git a/src/librbd/asio/ContextWQ.h b/src/librbd/asio/ContextWQ.h
index 2fff5b52cd4..3197756205d 100644
--- a/src/librbd/asio/ContextWQ.h
+++ b/src/librbd/asio/ContextWQ.h
@@ -4,6 +4,7 @@
 #ifndef CEPH_LIBRBD_ASIO_CONTEXT_WQ_H
 #define CEPH_LIBRBD_ASIO_CONTEXT_WQ_H
 
+#include "include/common_fwd.h"
 #include "include/Context.h"
 #include <atomic>
 #include <boost/asio/io_context.hpp>
@@ -15,7 +16,8 @@ namespace asio {
 
 class ContextWQ {
 public:
-  explicit ContextWQ(boost::asio::io_context& io_context);
+  explicit ContextWQ(CephContext* cct, boost::asio::io_context& io_context);
+  ~ContextWQ();
 
   void drain();
 
@@ -33,6 +35,7 @@ public:
   }
 
 private:
+  CephContext* m_cct;
   boost::asio::io_context& m_io_context;
   boost::asio::io_context::strand m_strand;