RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 14:34:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

crimson/osd: convert SnapTrimObjSubEvent::remove_or_update to ertr

Browse Source 
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
This commit is contained in:
Radoslaw Zarzynski 2022-12-11 16:38:38 +00:00
parent 30db140344
commit 912a940f46
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/crimson/osd/osd_operations/snaptrim_event.cc
View File

@ -402,7 +402,7 @@ void SnapTrimObjSubEvent::update_head(
attrs);
}
SnapTrimObjSubEvent::interruptible_future<
SnapTrimObjSubEvent::remove_or_update_iertr::future<
SnapTrimObjSubEvent::remove_or_update_ret_t>
SnapTrimObjSubEvent::remove_or_update(
ObjectContextRef obc,
@ -412,15 +412,18 @@ SnapTrimObjSubEvent::remove_or_update(
if (citer == obc->ssc->snapset.clone_snaps.end()) {
logger().error("{}: No clone_snaps in snapset {} for object {}",
*this, obc->ssc->snapset, coid);
return crimson::ct_error::enoent::make();
}
const auto& old_snaps = citer->second;
if (old_snaps.empty()) {
logger().error("{}: no object info snaps for object {}",
*this, coid);
return crimson::ct_error::enoent::make();
}
if (obc->ssc->snapset.seq == 0) {
logger().error("{}: no snapset.seq for object {}",
*this, coid);
return crimson::ct_error::enoent::make();
}
const OSDMapRef& osdmap = pg->get_osdmap();
std::set<snapid_t> new_snaps;
@ -507,8 +510,8 @@ seastar::future<> SnapTrimObjSubEvent::with_pg(
logger().debug("{}: processing clone_obc={}", *this, clone_obc);
return remove_or_update(
clone_obc, clone_obc->head
).then_unpack_interruptible([clone_obc, this]
(auto&& txn, auto&& log_entries) mutable {
).safe_then_unpack_interruptible([clone_obc, this]
(auto&& txn, auto&& log_entries) mutable {
auto [submitted, all_completed] = pg->submit_transaction(
std::move(clone_obc),
std::move(txn),

7
src/crimson/osd/osd_operations/snaptrim_event.h
View File

@ -149,9 +149,14 @@ private:
ceph::os::Transaction& txn,
std::vector<pg_log_entry_t>& log_entries);
using remove_or_update_ertr =
crimson::errorator<crimson::ct_error::enoent>;
using remove_or_update_iertr =
crimson::interruptible::interruptible_errorator<
IOInterruptCondition, remove_or_update_ertr>;
using remove_or_update_ret_t =
std::pair<ceph::os::Transaction, std::vector<pg_log_entry_t>>;
interruptible_future<remove_or_update_ret_t>
remove_or_update_iertr::future<remove_or_update_ret_t>
remove_or_update(ObjectContextRef obc, ObjectContextRef head_obc);
// we don't need to synchronize with other instances started by