From: Samuel Just <sjust@redhat.com>
Date: Mon, 16 Sep 2024 23:35:49 +0000 (+0000)
Subject: crimson/osd: remove CommonClientRequest::should_abort_request, no callers
X-Git-Tag: v20.0.0~935^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=847380958b83bce6a11f37b7f6f06208f4e14c39;p=ceph.git

crimson/osd: remove CommonClientRequest::should_abort_request, no callers

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

diff --git a/src/crimson/osd/osd_operations/client_request_common.cc b/src/crimson/osd/osd_operations/client_request_common.cc
index a56d58d2066c..68638d3a7b11 100644
--- a/src/crimson/osd/osd_operations/client_request_common.cc
+++ b/src/crimson/osd/osd_operations/client_request_common.cc
@@ -71,30 +71,4 @@ CommonClientRequest::do_recover_missing(
   }
 }
 
-bool CommonClientRequest::should_abort_request(
-  const Operation& op,
-  std::exception_ptr eptr)
-{
-  if (*eptr.__cxa_exception_type() ==
-      typeid(::crimson::common::actingset_changed)) {
-    try {
-      std::rethrow_exception(eptr);
-    } catch(::crimson::common::actingset_changed& e) {
-      if (e.is_primary()) {
-        logger().debug("{} {} operation restart, acting set changed", __func__, op);
-        return false;
-      } else {
-        logger().debug("{} {} operation abort, up primary changed", __func__, op);
-        return true;
-      }
-    }
-  } else {
-    assert(*eptr.__cxa_exception_type() ==
-      typeid(crimson::common::system_shutdown_exception));
-    crimson::get_logger(ceph_subsys_osd).debug(
-        "{} {} operation skipped, system shutdown", __func__, op);
-    return true;
-  }
-}
-
 } // namespace crimson::osd
diff --git a/src/crimson/osd/osd_operations/client_request_common.h b/src/crimson/osd/osd_operations/client_request_common.h
index 951bf653799e..4c3cf42777bd 100644
--- a/src/crimson/osd/osd_operations/client_request_common.h
+++ b/src/crimson/osd/osd_operations/client_request_common.h
@@ -16,9 +16,6 @@ struct CommonClientRequest {
     Ref<PG> pg,
     const hobject_t& soid,
     const osd_reqid_t& reqid);
-
-  static bool should_abort_request(
-    const crimson::Operation& op, std::exception_ptr eptr);
 };
 
 } // namespace crimson::osd