Skip to content

Commit 7207975

Browse files
committed
crimson/osd: Verbose assert_all aborts
Signed-off-by: Matan Breizman <[email protected]>
1 parent 27b232e commit 7207975

File tree

7 files changed

+17
-15
lines changed

7 files changed

+17
-15
lines changed

src/crimson/osd/osd_operations/client_request.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ ClientRequest::recover_missing_snaps(
316316
}
317317
return seastar::now();
318318
}).handle_error_interruptible(
319-
crimson::ct_error::assert_all("unexpected error")
319+
crimson::ct_error::assert_all(fmt::format("{} {} error", *pg, FNAME).c_str())
320320
);
321321
co_await std::move(resolve_oids);
322322

src/crimson/osd/osd_operations/internal_client_request.cc

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ InternalClientRequest::with_interruption()
8686
co_await pg->obc_loader.load_and_lock(
8787
obc_manager, pg->get_lock_type(op_info)
8888
).handle_error_interruptible(
89-
crimson::ct_error::assert_all("unexpected error")
89+
crimson::ct_error::assert_all(
90+
fmt::format("{} {} {} error when loading {}",*pg, FNAME, *this, get_target_oid()).c_str())
9091
);
9192

9293
auto params = get_do_osd_ops_params();
@@ -96,12 +97,8 @@ InternalClientRequest::with_interruption()
9697
co_await pg->run_executer(
9798
ox, obc_manager.get_obc(), op_info, osd_ops
9899
).handle_error_interruptible(
99-
crimson::ct_error::all_same_way(
100-
[this, FNAME](auto e) {
101-
ERRORDPPI("{}: got unexpected error {}", *pg, *this, e);
102-
ceph_assert(0 == "should not return an error");
103-
return interruptor::now();
104-
})
100+
crimson::ct_error::assert_all(
101+
fmt::format("{} {} {}: got unexpected error {}", *pg, FNAME, *this, get_target_oid()).c_str())
105102
);
106103

107104
auto [submitted, completed] = co_await pg->submit_executer(

src/crimson/osd/osd_operations/snaptrim_event.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,8 @@ SnapTrimObjSubEvent::start()
412412
obc_manager, RWState::RWWRITE
413413
).handle_error_interruptible(
414414
remove_or_update_iertr::pass_further{},
415-
crimson::ct_error::assert_all{"unexpected error in SnapTrimObjSubEvent"}
415+
crimson::ct_error::assert_all{fmt::format(
416+
"{} error SnapTrimObjSubEvent::snap_trim_obj_subevent_ret_t with {}", *this, coid).c_str()}
416417
);
417418

418419
logger().debug("{}: got obc={}", *this, obc_manager.get_obc()->get_oid());

src/crimson/osd/pg.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,8 @@ seastar::future<> PG::init(
730730
t.touch(coll_ref->get_cid(), pgid.make_snapmapper_oid());
731731
}
732732
},
733-
::crimson::ct_error::assert_all{"unexpected eio"}
733+
::crimson::ct_error::assert_all{fmt::format(
734+
"{} {} unexpected eio", *this, __func__).c_str()}
734735
);
735736
}
736737

src/crimson/osd/pg_backend.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1759,8 +1759,9 @@ PGBackend::tmapup_iertr::future<> PGBackend::tmapup(
17591759
return seastar::make_ready_future<bufferlist>();
17601760
}),
17611761
PGBackend::write_iertr::pass_further{},
1762-
crimson::ct_error::assert_all{"read error in mutate_object_contents"}
1763-
).si_then([this, &os, &osd_op, &txn,
1762+
crimson::ct_error::assert_all{fmt::format(
1763+
"read error in mutate_object_contents of {}", os.oi.soid).c_str()
1764+
}).si_then([this, &os, &osd_op, &txn,
17641765
&delta_stats, &osd_op_params]
17651766
(auto &&bl) mutable -> PGBackend::tmapup_iertr::future<> {
17661767
auto result = crimson::common::do_tmap_up(

src/crimson/osd/recovery_backend.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ RecoveryBackend::scan_for_backfill(
246246
crimson::ct_error::enoent::handle([](auto) {
247247
return false;
248248
}),
249-
crimson::ct_error::assert_all("unexpected error")
249+
crimson::ct_error::assert_all(fmt::format("{} {} error when loading obc", pg, FNAME).c_str())
250250
);
251251
if (!found) {
252252
// if the object does not exist here, it must have been removed

src/crimson/osd/replicated_recovery_backend.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ ReplicatedRecoveryBackend::maybe_pull_missing_obj(
153153
return recovery_waiter.wait_for_pull();
154154
});
155155
}).handle_error_interruptible(
156-
crimson::ct_error::assert_all("unexpected error")
156+
crimson::ct_error::assert_all(fmt::format(
157+
"{} {} error with {} need {} ", pg, FNAME, soid, need).c_str())
157158
);
158159
}
159160

@@ -746,7 +747,8 @@ ReplicatedRecoveryBackend::read_omap_for_push_op(
746747
return seastar::make_ready_future<seastar::stop_iteration>(
747748
stop ? seastar::stop_iteration::yes : seastar::stop_iteration::no
748749
);
749-
}, crimson::os::FuturizedStore::Shard::read_errorator::assert_all{});
750+
}, crimson::os::FuturizedStore::Shard::read_errorator::assert_all(fmt::format(
751+
"{} ReplicatedRecoveryBackend::read_omap_for_push_op error with {}", pg, oid).c_str()));
750752
});
751753
}
752754

0 commit comments

Comments
 (0)