]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd: remove CommonClientRequest::should_abort_request, no callers 59815/head
authorSamuel Just <sjust@redhat.com>
Mon, 16 Sep 2024 23:35:49 +0000 (23:35 +0000)
committerSamuel Just <sjust@redhat.com>
Tue, 17 Sep 2024 02:53:09 +0000 (19:53 -0700)
Signed-off-by: Samuel Just <sjust@redhat.com>
src/crimson/osd/osd_operations/client_request_common.cc
src/crimson/osd/osd_operations/client_request_common.h

index a56d58d2066c8e4e5c3770bf04337879f015fe74..68638d3a7b11a7880816d12eeb1580bc4948b846 100644 (file)
@@ -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
index 951bf653799e7247044f5300184ccda148653fbd..4c3cf42777bdbd423cc220eea4404f1329637a6b 100644 (file)
@@ -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