From: Ronen Friedman <rfriedma@redhat.com>
Date: Sat, 20 Feb 2021 13:44:13 +0000 (+0200)
Subject: osd: send the "blocked scrub" message to the cluster log
X-Git-Tag: v17.1.0~1561^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=efc5ba14e2db84b06345d4ca78973f21ec466330;p=ceph.git

osd: send the "blocked scrub" message to the cluster log

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
---

diff --git a/src/osd/pg_scrubber.cc b/src/osd/pg_scrubber.cc
index 8a85d55cd30b..8d2c041aa393 100644
--- a/src/osd/pg_scrubber.cc
+++ b/src/osd/pg_scrubber.cc
@@ -2161,13 +2161,14 @@ blocked_range_t::blocked_range_t(OSDService* osds, ceph::timespan waittime, spg_
     : m_osds{osds}
 {
   auto now_is = std::chrono::system_clock::now();
-  m_callbk = new LambdaContext([now_is, pg_id]([[maybe_unused]] int r) {
+  m_callbk = new LambdaContext([now_is, pg_id, osds]([[maybe_unused]] int r) {
     std::time_t now_c = std::chrono::system_clock::to_time_t(now_is);
     char buf[50];
     strftime(buf, sizeof(buf), "%Y-%m-%dT%H:%M:%S", std::localtime(&now_c));
     lgeneric_subdout(g_ceph_context, osd, 10)
       << "PgScrubber: " << pg_id << " blocked on an object for too long (since " << buf
       << ")" << dendl;
+    osds->clog->warn() << "osd." << osds->whoami << " PgScrubber: " << pg_id << " blocked on an object for too long (since " << buf << ")";
     return;
   });