RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 11:07:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #56375 from athanatos/sjust/wip-64996-deepscrub-crash

Browse Source 
crimson/.../scrub_events: fix progress lifetime in deep_scan_object

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
This commit is contained in:
Samuel Just 2024-03-23 19:42:51 -07:00 committed by GitHub
commit df1ae4de15
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/crimson/osd/osd_operations/scrub_events.cc
View File

@ -258,9 +258,10 @@ ScrubScan::ifut<> ScrubScan::deep_scan_object(
DEBUGDPP("obj: {}", pg, obj);
using crimson::common::local_conf;
auto &entry = ret.objects[obj.hobj];
auto progress_ref = std::make_unique<obj_scrub_progress_t>();
auto &progress = *progress_ref;
return interruptor::repeat(
[FNAME, this, progress = obj_scrub_progress_t(),
&obj, &entry, &pg]() mutable
[FNAME, this, &progress, &obj, &entry, &pg]()
-> interruptible_future<seastar::stop_iteration> {
if (progress.offset) {
DEBUGDPP("op: {}, obj: {}, progress: {} scanning data",
@ -272,7 +273,10 @@ ScrubScan::ifut<> ScrubScan::deep_scan_object(
obj,
*(progress.offset),
stride
).safe_then([stride, &progress, &entry](auto bl) {
).safe_then([this, FNAME, stride, &obj, &progress, &entry, &pg](auto bl) {
size_t offset = *progress.offset;
DEBUGDPP("op: {}, obj: {}, progress: {} got offset {}",
pg, *this, obj, progress, offset);
progress.data_hash << bl;
if (bl.length() < stride) {
progress.offset = std::nullopt;
@ -373,7 +377,7 @@ ScrubScan::ifut<> ScrubScan::deep_scan_object(
seastar::make_ready_future<seastar::stop_iteration>(
seastar::stop_iteration::yes));
}
});
}).finally([progress_ref=std::move(progress_ref)] {});
}
template class ScrubAsyncOpT<ScrubScan>;