From: Samuel Just <sjust@redhat.com>
Date: Wed, 25 Jan 2023 05:33:07 +0000 (-0800)
Subject: crimson/osd/pg_interval_interrupt_condition: use new logging macros
X-Git-Tag: v18.1.0~419^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6b99bb037f67058dbdf7f2e999fb78e91a19e328;p=ceph.git

crimson/osd/pg_interval_interrupt_condition: use new logging macros

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/crimson/osd/pg_interval_interrupt_condition.cc b/src/crimson/osd/pg_interval_interrupt_condition.cc
index b7b6af981a268..36243b8257525 100644
--- a/src/crimson/osd/pg_interval_interrupt_condition.cc
+++ b/src/crimson/osd/pg_interval_interrupt_condition.cc
@@ -6,6 +6,8 @@
 
 #include "crimson/common/log.h"
 
+SET_SUBSYS(osd);
+
 namespace crimson::osd {
 
 IOInterruptCondition::IOInterruptCondition(Ref<PG>& pg)
@@ -17,17 +19,20 @@ IOInterruptCondition::~IOInterruptCondition() {
 }
 
 bool IOInterruptCondition::new_interval_created() {
-  bool ret = e < pg->get_interval_start_epoch();
-  if (ret)
-    ::crimson::get_logger(ceph_subsys_osd).debug(
-      "{} new interval, should interrupt, e{}", *pg, e);
+  LOG_PREFIX(IOInterruptCondition::new_interval_created);
+  const epoch_t interval_start = pg->get_interval_start_epoch();
+  bool ret = e < interval_start;
+  if (ret) {
+    DEBUGDPP("stored interval e{} < interval_start e{}", *pg, e, interval_start);
+  }
   return ret;
 }
 
 bool IOInterruptCondition::is_stopping() {
-  if (pg->stopping)
-    ::crimson::get_logger(ceph_subsys_osd).debug(
-      "{} shutting down, should interrupt", *pg);
+  LOG_PREFIX(IOInterruptCondition::is_stopping);
+  if (pg->stopping) {
+    DEBUGDPP("pg stopping", *pg);
+  }
   return pg->stopping;
 }