Skip to content

Commit 8473809

Browse files
committed
crimson/osd: remove CommonClientRequest::should_abort_request, no callers
Signed-off-by: Samuel Just <[email protected]>
1 parent 5c280d2 commit 8473809

File tree

2 files changed

+0
-29
lines changed

2 files changed

+0
-29
lines changed

src/crimson/osd/osd_operations/client_request_common.cc

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -71,30 +71,4 @@ CommonClientRequest::do_recover_missing(
7171
}
7272
}
7373

74-
bool CommonClientRequest::should_abort_request(
75-
const Operation& op,
76-
std::exception_ptr eptr)
77-
{
78-
if (*eptr.__cxa_exception_type() ==
79-
typeid(::crimson::common::actingset_changed)) {
80-
try {
81-
std::rethrow_exception(eptr);
82-
} catch(::crimson::common::actingset_changed& e) {
83-
if (e.is_primary()) {
84-
logger().debug("{} {} operation restart, acting set changed", __func__, op);
85-
return false;
86-
} else {
87-
logger().debug("{} {} operation abort, up primary changed", __func__, op);
88-
return true;
89-
}
90-
}
91-
} else {
92-
assert(*eptr.__cxa_exception_type() ==
93-
typeid(crimson::common::system_shutdown_exception));
94-
crimson::get_logger(ceph_subsys_osd).debug(
95-
"{} {} operation skipped, system shutdown", __func__, op);
96-
return true;
97-
}
98-
}
99-
10074
} // namespace crimson::osd

src/crimson/osd/osd_operations/client_request_common.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ struct CommonClientRequest {
1616
Ref<PG> pg,
1717
const hobject_t& soid,
1818
const osd_reqid_t& reqid);
19-
20-
static bool should_abort_request(
21-
const crimson::Operation& op, std::exception_ptr eptr);
2219
};
2320

2421
} // namespace crimson::osd

0 commit comments

Comments
 (0)