crimson/.../client_request_common: convert do_recover_missing to use log macros

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 05230fc9bf097fecfe3cb948105277c2fc41ba63)

diff --git a/src/crimson/osd/osd_operations/client_request_common.cc b/src/crimson/osd/osd_operations/client_request_common.cc
index 68638d3a7b11a7880816d12eeb1580bc4948b846..e08ce13339c55491f1df4bb0051522d825155d9a 100644 (file)
--- a/src/crimson/osd/osd_operations/client_request_common.cc
+++ b/src/crimson/osd/osd_operations/client_request_common.cc
@@ -1,15 +1,12 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:nil -*-
 // vim: ts=8 sw=2 smarttab expandtab
 
+#include "crimson/common/log.h"
 #include "crimson/osd/osd_operations/client_request_common.h"
 #include "crimson/osd/pg.h"
 #include "crimson/osd/osd_operations/background_recovery.h"
 
-namespace {
-  seastar::logger& logger() {
-    return crimson::get_logger(ceph_subsys_osd);
-  }
-}
+SET_SUBSYS(osd);
 
 namespace crimson::osd {
 
@@ -19,8 +16,10 @@ CommonClientRequest::do_recover_missing(
   const hobject_t& soid,
   const osd_reqid_t& reqid)
 {
-  logger().debug("{} reqid {} check for recovery, {}",
-                 __func__, reqid, soid);
+  LOG_PREFIX(CommonCLientRequest::do_recover_missing);
+  DEBUGDPP(
+    "reqid {} check for recovery, {}",
+    *pg, reqid, soid);
   assert(pg->is_primary());
   eversion_t ver;
   auto &peering_state = pg->get_peering_state();
@@ -28,42 +27,48 @@ CommonClientRequest::do_recover_missing(
   bool needs_recovery_or_backfill = false;
 
   if (pg->is_unreadable_object(soid)) {
-    logger().debug("{} reqid {}, {} is unreadable",
-                   __func__, reqid, soid);
+    DEBUGDPP(
+      "reqid {}, {} is unreadable",
+      *pg, reqid, soid);
     ceph_assert(missing_loc.needs_recovery(soid, &ver));
     needs_recovery_or_backfill = true;
   }
 
   if (pg->is_degraded_or_backfilling_object(soid)) {
-    logger().debug("{} reqid {}, {} is degraded or backfilling",
-                   __func__, reqid, soid);
+    DEBUGDPP(
+      "reqid {}, {} is degraded or backfilling",
+      *pg, reqid, soid);
     if (missing_loc.needs_recovery(soid, &ver)) {
       needs_recovery_or_backfill = true;
     }
   }
 
   if (!needs_recovery_or_backfill) {
-    logger().debug("{} reqid {} nothing to recover {}",
-                   __func__, reqid, soid);
+    DEBUGDPP(
+      "reqid {} nothing to recover {}",
+      *pg, reqid, soid);
     return seastar::make_ready_future<bool>(false);
   }
 
   if (pg->get_peering_state().get_missing_loc().is_unfound(soid)) {
     return seastar::make_ready_future<bool>(true);
   }
-  logger().debug("{} reqid {} need to wait for recovery, {} version {}",
-                 __func__, reqid, soid, ver);
+  DEBUGDPP(
+    "reqid {} need to wait for recovery, {} version {}",
+    *pg, reqid, soid);
   if (pg->get_recovery_backend()->is_recovering(soid)) {
-    logger().debug("{} reqid {} object {} version {}, already recovering",
-                   __func__, reqid, soid, ver);
+    DEBUGDPP(
+      "reqid {} object {} version {}, already recovering",
+      *pg, reqid, soid, ver);
     return pg->get_recovery_backend()->get_recovering(
       soid).wait_for_recovered(
     ).then([] {
       return seastar::make_ready_future<bool>(false);
     });
   } else {
-    logger().debug("{} reqid {} object {} version {}, starting recovery",
-                   __func__, reqid, soid, ver);
+    DEBUGDPP(
+      "reqid {} object {} version {}, starting recovery",
+      *pg, reqid, soid, ver);
     auto [op, fut] =
       pg->get_shard_services().start_operation<UrgentRecovery>(
         soid, ver, pg, pg->get_shard_services(), pg->get_osdmap_epoch());